Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 6 Feb 2012 08:42:54 +0000 (08:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 6 Feb 2012 08:42:54 +0000 (08:42 +0000)
commit0053aa290021ac7611e8ae6a1f3dfebdcce0c9f5
treeb86f05df2c4126aeefb74da8cf630d9cbf5d43b3
parent542dd73658709e8fde109b459427db84c34d5aaf
parentbc9f8b0b13d7eda8f636dc01ee686a2abe6b7b88
Merge branch 'master' of darcs.haskell.org/ghc