Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 6 Nov 2012 16:26:57 +0000 (16:26 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 6 Nov 2012 16:26:57 +0000 (16:26 +0000)

Trivial merge