Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jan 2012 14:11:53 +0000 (14:11 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jan 2012 14:11:53 +0000 (14:11 +0000)

Trivial merge