[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (abde6c5)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

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

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

commit abde6c5fb68f19ac55b6c62ca2eeb4ad47419931
Merge: 8b11578 b53f97e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Mar 9 20:00:33 2013 +0000

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

 compiler/cmm/CmmCommonBlockElim.hs |   5 -
 compiler/cmm/CmmUtils.hs           |  11 +-
 compiler/codeGen/StgCmmEnv.hs      | 133 +++++++--------
 compiler/codeGen/StgCmmHeap.hs     |  83 ----------
 compiler/codeGen/StgCmmMonad.hs    | 330 ++++++++++++++++++-------------------
 compiler/codeGen/StgCmmUtils.hs    |   4 +-
 compiler/typecheck/TcDeriv.lhs     |  14 +-
 compiler/utils/Outputable.lhs      |   5 +-
 8 files changed, 240 insertions(+), 345 deletions(-)