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

Trivial merge