Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 Apr 2012 11:48:46 +0000 (12:48 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 Apr 2012 11:48:46 +0000 (12:48 +0100)
commit4005255326cb5aba88d1c384a835cb50951e821c
treef303231c38ee4dccf524a18940ffc5f9c47edef4
parenta40ee020b53d3b397d24f4addeda78945e72292a
parent61e9a6cc3536a28ae3b9d3507d2bda58993c2fe5
Merge branch 'master' of darcs.haskell.org/ghc