Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 17:21:00 +0000 (17:21 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 17:21:00 +0000 (17:21 +0000)

Trivial merge