Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Sun, 4 Dec 2011 15:34:59 +0000 (15:34 +0000)
committerIan Lynagh <igloo@earth.li>
Sun, 4 Dec 2011 15:34:59 +0000 (15:34 +0000)
commit9911ec5554b4b0a9492cdf5fd80e3239c448ec2b
treecda495e6587fb706be4171e77b65b420e811d316
parent1a8c2bb00eed3e798c38d215f2b2f047e4bf75cc
parent9a0adc0b01aa62bd605145a555d26645229d5cc1
Merge branch 'master' of darcs.haskell.org/ghc