Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Jan 2013 16:46:40 +0000 (16:46 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Jan 2013 16:46:40 +0000 (16:46 +0000)

Trivial merge