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

Trivial merge