Merge remote branch 'origin/master' into ghc-new-co
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 16:34:16 +0000 (17:34 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 16:34:16 +0000 (17:34 +0100)

Trivial merge