Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 19:33:48 +0000 (19:33 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 19:33:48 +0000 (19:33 +0000)

Trivial merge