Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 Apr 2012 12:51:26 +0000 (13:51 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 Apr 2012 12:51:26 +0000 (13:51 +0100)

Trivial merge