[commit: ghc] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics (9e4c8ad)

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/9e4c8ad32eff3bf0350480109b2f5a5ad4738f09

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

commit 9e4c8ad32eff3bf0350480109b2f5a5ad4738f09
Merge: 61d89bc... 2d52051...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Tue May 10 08:12:21 2011 +0200

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

 compiler/cmm/CmmNode.hs       |   28 +++++++++++++++++++++++++---
 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 ++++++++++-
 7 files changed, 63 insertions(+), 15 deletions(-)