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

Trivial merge