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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/25fa4bdbff4a84d6717c4ff7cdf7080687616818

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

commit 25fa4bdbff4a84d6717c4ff7cdf7080687616818
Merge: fd26d0a... 4085904...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 20 12:27:31 2011 +0100

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

 compiler/cmm/CLabel.hs               |   12 ++++++++++--
 compiler/cmm/PprC.hs                 |    2 +-
 compiler/llvmGen/LlvmCodeGen/Regs.hs |    2 ++
 compiler/main/StaticFlagParser.hs    |    1 -
 ghc/ghc.mk                           |   24 +++++++++++++-----------
 5 files changed, 26 insertions(+), 15 deletions(-)