Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 23 Dec 2011 17:57:13 +0000 (17:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 23 Dec 2011 17:57:13 +0000 (17:57 +0000)

Trivial merge