Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 20 Jan 2012 12:47:25 +0000 (12:47 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 20 Jan 2012 12:47:25 +0000 (12:47 +0000)
commit8de2a036954195748260aa070c5883432a7d4a12
treed409e500f472b895e320e3cf912810dfe3842aa4
parent7f06d92570effdfde67d398ddd471c82a04c8c6f
parentd2dcac6a0291d5271bf7f8ff1394121abd6901d2
Merge branch 'master' of darcs.haskell.org/ghc