Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 May 2012 16:52:24 +0000 (17:52 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 May 2012 16:52:24 +0000 (17:52 +0100)
1  2 
compiler/coreSyn/CoreSyn.lhs
compiler/coreSyn/CoreUnfold.lhs
compiler/coreSyn/CoreUtils.lhs

Simple merge
Simple merge
Simple merge