Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Jun 2011 07:22:16 +0000 (08:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 23 Jun 2011 07:22:16 +0000 (08:22 +0100)
commit58e156a6102d57bc69b4ccd2fede03fb15040d78
treea79458a33ec99ca6897d61c37d5ba69504de56aa
parent90a8c94e02ea68ef13a765eaa738aebb497d7b6b
parente9bc0dde881a615e01f8fc5e52dd2264f163e5fd
Merge branch 'master' of darcs.haskell.org/ghc