Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 Nov 2011 09:20:40 +0000 (09:20 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 11 Nov 2011 09:20:40 +0000 (09:20 +0000)
1  2 
compiler/coreSyn/CoreLint.lhs
compiler/simplCore/Simplify.lhs

Simple merge
Simple merge