Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 11 Feb 2013 08:38:33 +0000 (08:38 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 11 Feb 2013 08:38:33 +0000 (08:38 +0000)

Trivial merge