[commit: ghc] cpr-sum-types: Merge branch 'master' of http://darcs.haskell.org/ghc (69fdc7e)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : cpr-sum-types

http://hackage.haskell.org/trac/ghc/changeset/69fdc7edc1de5bc73c6be0a46c55fb889ff936ea

>---------------------------------------------------------------

commit 69fdc7edc1de5bc73c6be0a46c55fb889ff936ea
Merge: 9a6555b... 30ccc9f...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jul 27 15:03:54 2011 +0100

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/cmm/CmmDecl.hs         |    6 ++++--
 compiler/coreSyn/CorePrep.lhs   |    5 +++--
 compiler/main/DriverPipeline.hs |   11 +++++++++++
 compiler/simplCore/CSE.lhs      |   25 ++++++++++++++-----------
 4 files changed, 32 insertions(+), 15 deletions(-)