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

Trivial merge