Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Aug 2011 06:47:23 +0000 (07:47 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Aug 2011 06:47:23 +0000 (07:47 +0100)

Trivial merge