[commit: ghc] type-nats: Merge remote-tracking branch 'origin/type-nats' into type-nats-merge (6486732)

[Iavor Diatchki]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/648673209429c0f4bf1e77aa5e69fb97f91933a7

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

commit 648673209429c0f4bf1e77aa5e69fb97f91933a7
Merge: 7c2af5c... 0b11494...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Dec 18 17:25:27 2011 -0800

    Merge remote-tracking branch 'origin/type-nats' into type-nats-merge