[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (202f60a)

[Simon Peyton Jones]

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

On branch  : master

https://github.com/ghc/ghc/commit/202f60a6c8c80a3a44e6c214f9ed5e8ad44c1161

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

commit 202f60a6c8c80a3a44e6c214f9ed5e8ad44c1161
Merge: 3fc6ead 024df66
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Apr 12 13:27:02 2013 +0100

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

 compiler/codeGen/StgCmmBind.hs  | 23 +++++++++++--------
 compiler/codeGen/StgCmmCon.hs   | 21 +++++++++++-------
 compiler/codeGen/StgCmmExpr.hs  |  7 +++---
 compiler/codeGen/StgCmmHeap.hs  | 14 +++++++-----
 compiler/codeGen/StgCmmMonad.hs |  2 +-
 compiler/codeGen/StgCmmTicky.hs | 49 ++++++++++++++++++++++++-----------------
 6 files changed, 69 insertions(+), 47 deletions(-)