Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 4 Nov 2011 17:03:35 +0000 (17:03 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 4 Nov 2011 17:03:35 +0000 (17:03 +0000)
1  2 
compiler/simplCore/Simplify.lhs

Simple merge