[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (3e9679a)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3e9679af563bafa0764e4f07c4b8c951168598b6

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

commit 3e9679af563bafa0764e4f07c4b8c951168598b6
Merge: 64a2763... adc3fb8...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jul 27 13:09:34 2011 +0100

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

 compiler/cmm/CmmDecl.hs       |    6 ++++--
 compiler/coreSyn/CorePrep.lhs |    5 +++--
 compiler/simplCore/CSE.lhs    |   25 ++++++++++++++-----------
 3 files changed, 21 insertions(+), 15 deletions(-)