Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 27 Apr 2012 16:35:32 +0000 (17:35 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 27 Apr 2012 16:35:32 +0000 (17:35 +0100)

Trivial merge