Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 Nov 2011 07:39:41 +0000 (07:39 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 Nov 2011 07:39:41 +0000 (07:39 +0000)

Trivial merge