Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 22 Jun 2011 14:42:10 +0000 (15:42 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 22 Jun 2011 14:42:10 +0000 (15:42 +0100)

Trivial merge