Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 May 2012 14:44:30 +0000 (15:44 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 May 2012 14:44:30 +0000 (15:44 +0100)

Trivial merge