[commit: base] new-typeable: Merge branch 'master' into new-typeable (cd2ce2b)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/cd2ce2b329de967c63a12eb506e38a3a9758748a

>---------------------------------------------------------------

commit cd2ce2b329de967c63a12eb506e38a3a9758748a
Merge: cde32a3... 0d87677...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Wed Oct 3 09:02:28 2012 +0100

    Merge branch 'master' into new-typeable

 GHC/TypeLits.hs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)