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

Trivial merge