[commit: base] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base (bab6235)

[Ian Lynagh]

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

On branch  : master

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

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

commit bab62355c09b1c07d53aa15b28e0893089049f8d
Merge: 151c2fc... 8a7f4a1...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Nov 30 14:05:10 2012 +0000

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base

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