Merge branch 'master' of /home/dafis/GHC/./ghc//libraries/base
authorDaniel Fischer <daniel.is.fischer@googlemail.com>
Mon, 1 Aug 2011 13:12:49 +0000 (15:12 +0200)
committerDaniel Fischer <daniel.is.fischer@googlemail.com>
Mon, 1 Aug 2011 13:12:49 +0000 (15:12 +0200)

Trivial merge