Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:15:46 +0000 (16:15 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:15:46 +0000 (16:15 +0000)

Trivial merge