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

Trivial merge