Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jul 2012 08:17:53 +0000 (09:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jul 2012 08:17:53 +0000 (09:17 +0100)

Trivial merge