Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:43:19 +0000 (11:43 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:43:19 +0000 (11:43 +0100)

Trivial merge