Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 Jan 2012 08:32:02 +0000 (08:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 Jan 2012 08:32:02 +0000 (08:32 +0000)

Trivial merge