Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 May 2012 07:08:13 +0000 (08:08 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 May 2012 07:08:13 +0000 (08:08 +0100)

Trivial merge