Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 10 Nov 2011 20:00:52 +0000 (20:00 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 10 Nov 2011 20:00:52 +0000 (20:00 +0000)
1  2 
compiler/deSugar/DsUtils.lhs
compiler/simplCore/Simplify.lhs

Simple merge
Simple merge