Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:27:16 +0000 (23:27 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:27:16 +0000 (23:27 +0000)
commit35b32a08e8ddb4e479e8c7d67a120ef80c61c322
treeb8fa71916e20554e8fd15890b41f3717551e3fd8
parent1f046163171fd064ce1211f41896614cf48a3752
parent0936621a72da0e8811d351be6f03edd5d724f711
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc