[commit: ghc] master: Merge remote branch 'origin/master' (cd54b70)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit cd54b707b0d77a3c62ee9f57b82dae98727f1c34
Merge: cbebca1... 9fb9395...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed May 11 17:28:26 2011 +0100

    Merge remote branch 'origin/master'

 compiler/cmm/CmmNode.hs       |   28 +++++++++++++++++++++++++---
 compiler/cmm/CmmParse.y       |   25 +++++++++++++++----------
 compiler/cmm/cmm-notes        |    4 ++++
 compiler/deSugar/Coverage.lhs |    9 ++++++---
 compiler/hsSyn/HsExpr.lhs     |   10 ++++++----
 compiler/nativeGen/X86/Ppr.hs |   14 ++++++++++----
 compiler/rename/RnExpr.lhs    |    2 ++
 rts/ProfHeap.c                |   11 ++++++++++-
 rts/Schedule.c                |   12 ++++++------
 rts/Stats.c                   |   24 ++++++++++++------------
 10 files changed, 96 insertions(+), 43 deletions(-)