Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Feb 2012 13:50:39 +0000 (13:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Feb 2012 13:50:39 +0000 (13:50 +0000)

Trivial merge