Merge master into the ghc-new-co branch
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)

No differences found