Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 18 Oct 2011 16:18:32 +0000 (17:18 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 18 Oct 2011 16:18:32 +0000 (17:18 +0100)
commitead78579ce9c32d53f848d03921a718e6d33f05d
tree744507d686cfcc657dc39ca0ece5c88ded541eb5
parent7b6de599c9ebc7259b1fc86e40688125ed1f1688
parentae583f2949570755c8a03f68a71416c0fd7f257c
Merge branch 'master' of darcs.haskell.org/ghc