Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 13 Jun 2012 16:26:56 +0000 (17:26 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 13 Jun 2012 16:26:56 +0000 (17:26 +0100)

Trivial merge