Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jul 2012 15:40:51 +0000 (16:40 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jul 2012 15:40:51 +0000 (16:40 +0100)

Trivial merge