Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 18 Jan 2012 15:29:45 +0000 (15:29 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 18 Jan 2012 15:29:45 +0000 (15:29 +0000)

Trivial merge