Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:23 +0000 (14:33 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:23 +0000 (14:33 +0100)

Trivial merge