[commit: base] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (a360b6b)

[Iavor Diatchki]

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

On branch  : type-nats

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

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

commit a360b6b3ee7055183cf662eedef5e76864604f02
Merge: 6e46a3f... ebcb55d...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sat Mar 24 16:23:17 2012 -0700

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

 GHC/IO.hs         |   22 ++++++++++++++++++----
 tests/5943.hs     |   36 ++++++++++++++++++++++++++++++++++++
 tests/5943.stdout |    7 +++++++
 tests/all.T       |    2 ++
 4 files changed, 63 insertions(+), 4 deletions(-)