Merge branch 'master' of /home/dafis/GHC/./ghc//libraries/base
authorDaniel Fischer <daniel.is.fischer@googlemail.com>
Sun, 7 Aug 2011 08:47:24 +0000 (10:47 +0200)
committerDaniel Fischer <daniel.is.fischer@googlemail.com>
Sun, 7 Aug 2011 08:47:24 +0000 (10:47 +0200)

Trivial merge