Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Jun 2011 07:22:16 +0000 (08:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Jun 2011 07:22:16 +0000 (08:22 +0100)

Trivial merge