Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 22 Jun 2011 14:42:10 +0000 (15:42 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 22 Jun 2011 14:42:10 +0000 (15:42 +0100)
commiteab7f5ff457e14413641fae9fc7589bf4e93e3ae
treee2d67384dc0d7ae4c6b1d592e663b400f01b05c8
parent2e2651da55f577db59f274b99a71d8a50bc7a961
parenta9d48fd94ae92b979610f5efe5d66506928118eb
Merge branch 'master' of darcs.haskell.org/ghc