Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 19 Dec 2011 16:45:53 +0000 (16:45 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 19 Dec 2011 16:45:53 +0000 (16:45 +0000)

Trivial merge