[commit: ghc] master: Merge branch 'master' of /Users/benl/devel/ghc/ghc-head (d08789a)

[Ben Lippmeier]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/d08789a5f1aa92d3fc45239a842e0d0701e0ac2c

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

commit d08789a5f1aa92d3fc45239a842e0d0701e0ac2c
Merge: 9b4854f... 25297a1...
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Fri Apr 15 15:24:42 2011 +1000

    Merge branch 'master' of /Users/benl/devel/ghc/ghc-head

 HACKING                          |    7 ++++++-
 aclocal.m4                       |   10 +++-------
 compiler/cmm/CmmExpr.hs          |    6 ++++--
 compiler/cmm/OptimizationFuel.hs |   14 --------------
 compiler/codeGen/CodeGen.lhs     |    2 +-
 compiler/codeGen/StgCmm.hs       |    3 ++-
 compiler/utils/GraphOps.hs       |   15 ++++++++-------
 compiler/utils/UniqFM.lhs        |   23 ++++++++++++++++++++++-
 rts/sm/GC.c                      |    8 ++++++--
 9 files changed, 52 insertions(+), 36 deletions(-)