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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/27fc7caae0f3acd9ecbfcfcd561a922df69fbb6d

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

commit 27fc7caae0f3acd9ecbfcfcd561a922df69fbb6d
Merge: 2fcc09a... 25297a1...
Author: unknown <simonpj at .europe.corp.microsoft.com>
Date:   Thu Apr 14 08:39:14 2011 +0100

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

 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/Linker.c                     |   18 +++++++++++-------
 rts/sm/GC.c                      |    8 ++++++--
 10 files changed, 63 insertions(+), 43 deletions(-)