Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 13:25:21 +0000 (14:25 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 2 Aug 2011 13:25:21 +0000 (14:25 +0100)
commitf49079a3c6b349340018dddbfe962654997397a1
tree407cd5c050d1a6feb8e67fdeba7095f72862d07b
parentbdf364e86560ddb25676c259a331b7fcd722d26d
parentdd96a196e4719d04ba78675069e93d01a50b7b33
Merge branch 'master' of darcs.haskell.org/ghc