Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 10:21:50 +0000 (11:21 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 10:21:50 +0000 (11:21 +0100)

Trivial merge