Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 17:38:59 +0000 (18:38 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 17:38:59 +0000 (18:38 +0100)

Trivial merge