Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 4 Oct 2012 16:56:11 +0000 (17:56 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 4 Oct 2012 16:56:11 +0000 (17:56 +0100)

Trivial merge