Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 08:36:09 +0000 (08:36 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 08:36:09 +0000 (08:36 +0000)

Trivial merge