Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 28 Jan 2013 13:51:55 +0000 (13:51 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 28 Jan 2013 13:51:55 +0000 (13:51 +0000)

Trivial merge