[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (969383b)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/969383ba17493d67664b2c0faaec481561401b18

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

commit 969383ba17493d67664b2c0faaec481561401b18
Merge: 1538916... 06dc181...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jul 29 11:21:50 2011 +0100

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

 compiler/cmm/CLabel.hs            |   53 ++++++------------------------------
 compiler/cmm/CmmDecl.hs           |    9 +-----
 compiler/cmm/CmmInfo.hs           |   13 ++++-----
 compiler/cmm/CmmParse.y           |   14 +++++-----
 compiler/cmm/CmmProcPoint.hs      |   53 ++++++++++++++++++++----------------
 compiler/codeGen/CgInfoTbls.hs    |   13 ++++-----
 compiler/codeGen/ClosureInfo.lhs  |   52 ++++++++++++++++++++----------------
 compiler/codeGen/StgCmmClosure.hs |   52 ++++++++++++++++++++----------------
 compiler/codeGen/StgCmmLayout.hs  |    6 +---
 9 files changed, 119 insertions(+), 146 deletions(-)