Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 Nov 2011 22:01:48 +0000 (22:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 Nov 2011 22:01:48 +0000 (22:01 +0000)

Trivial merge