Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Nov 2011 22:23:19 +0000 (22:23 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 14 Nov 2011 22:23:19 +0000 (22:23 +0000)
1  2 
compiler/simplCore/Simplify.lhs

Simple merge