Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Sep 2011 09:07:46 +0000 (10:07 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Sep 2011 09:07:46 +0000 (10:07 +0100)

Trivial merge