Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 6 Feb 2012 08:42:54 +0000 (08:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 6 Feb 2012 08:42:54 +0000 (08:42 +0000)

Trivial merge