Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 21:41:19 +0000 (22:41 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 21:41:19 +0000 (22:41 +0100)
commitf13f9fca8444da225443aea190e8659b96954ae9
tree2ea559577e2ef3508d4567be6f1c524416da35e8
parent735519b465ba75a5d254848fb7f100bdaea89aa9
parentda15d0c556df3eacc6b37327ddffffea306b3760
Merge branch 'master' of darcs.haskell.org/ghc