Merge branch 'master' of http://darcs.haskell.org/packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 17:22:08 +0000 (17:22 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 17:22:08 +0000 (17:22 +0000)

Trivial merge