Merge branch 'master' of http://darcs.haskell.org//packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:31:06 +0000 (13:31 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:31:06 +0000 (13:31 +0000)

Trivial merge