Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Mon, 4 Apr 2011 15:45:42 +0000 (16:45 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 4 Apr 2011 15:45:42 +0000 (16:45 +0100)
1  2 
sync-all

diff --cc sync-all
Simple merge