Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Jun 2012 08:47:07 +0000 (09:47 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Jun 2012 08:47:07 +0000 (09:47 +0100)

Trivial merge