Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 12 Oct 2012 12:59:19 +0000 (13:59 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 12 Oct 2012 12:59:19 +0000 (13:59 +0100)

Trivial merge