Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 2 Dec 2011 22:30:58 +0000 (22:30 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 2 Dec 2011 22:30:58 +0000 (22:30 +0000)
1  2 
compiler/codeGen/CgProf.hs
compiler/codeGen/StgCmmProf.hs

Simple merge
Simple merge