Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:27:31 +0000 (12:27 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:27:31 +0000 (12:27 +0100)
commit25fa4bdbff4a84d6717c4ff7cdf7080687616818
treef0b59c46247272a938d75d2661c1c3fefd9fc688
parentfd26d0ac1b48890dc7c3b5b60b42373fa964cdc8
parent40859045bf3e74efb5443b407bb01978e742e49d
Merge branch 'master' of darcs.haskell.org/ghc