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)
commit4fb390370051439c89958be96308d6d0577ff864
tree57a858398e4702dee497319b0053be47422c43a1
parent9fd5a2ca9b5dda5b45af57cea7c8dc6f3dab422d
parent1469f1eb7817fbc46b17e994498450a9a6b12ea7
Merge branch 'master' of darcs.haskell.org/ghc
compiler/codeGen/CgProf.hs
compiler/codeGen/StgCmmProf.hs