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

Trivial merge