Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 13:25:21 +0000 (14:25 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 13:25:21 +0000 (14:25 +0100)

Trivial merge