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

[Simon Peyton Jones]

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

On branch  : master

https://github.com/ghc/ghc/commit/1aa7ae3fbc52950f4737bdc4a30597ecbec30829

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

commit 1aa7ae3fbc52950f4737bdc4a30597ecbec30829
Merge: d6ceeaa 47556a8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Apr 15 15:44:15 2013 +0100

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

 compiler/cmm/CmmNode.hs         | 29 +++++++++---------------
 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 +++++++++++++++++------------------------
 compiler/nativeGen/PIC.hs       | 16 ++++----------
 8 files changed, 62 insertions(+), 99 deletions(-)