Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 Nov 2011 16:06:54 +0000 (16:06 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 Nov 2011 16:06:54 +0000 (16:06 +0000)

Trivial merge