Merge remote-tracking branch 'laptop/newcg' into newcg
authorMe at work <simonmar-work@simonmar-laptop.(none)>
Tue, 14 Feb 2012 11:49:53 +0000 (11:49 +0000)
committerMe at work <simonmar-work@simonmar-laptop.(none)>
Tue, 14 Feb 2012 11:49:53 +0000 (11:49 +0000)
1  2 
compiler/codeGen/CgInfoTbls.hs
compiler/codeGen/StgCmmForeign.hs

Simple merge
Simple merge