Merge branch 'master' of http://darcs.haskell.org//ghc
authorIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 17:18:19 +0000 (18:18 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 17:18:19 +0000 (18:18 +0100)
commit5ccb43f3306bb0907948d97ea6bffe9f70c69554
tree3cb6caaa3c6f2d5a0a1057d939514010ed492416
parent59e1f0687aa6e2d65c4de314f80b13e4aedad8bc
parent921530b477867edb5158e4ad5bbbdb5c7c531c97
Merge branch 'master' of darcs.haskell.org//ghc