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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8699195c3fc50bb45852a87734c14b0aa157462e

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

commit 8699195c3fc50bb45852a87734c14b0aa157462e
Merge: 24d4861... 54405b8...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Oct 16 14:15:07 2012 +0100

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

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