Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 May 2012 07:08:13 +0000 (08:08 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 1 May 2012 07:08:13 +0000 (08:08 +0100)
commitd1e84be2c2771f24ba9e31a6c35fc85edbbb7506
tree02ad308f88bd3fc9f91e4b5624ed68104359aa14
parent67c793a3a13482bc897810e3b5e13f96942afc68
parent3457c6befa697e52dd71f7efa1940f010f792469
Merge branch 'master' of darcs.haskell.org/ghc