[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (3fc546f)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3fc546fe23108f29045c194898e1cc87e13592a7

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

commit 3fc546fe23108f29045c194898e1cc87e13592a7
Merge: d814d50... 21a53a1...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jun 7 17:29:57 2012 +0100

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

 compiler/codeGen/CgClosure.lhs    |    7 ++++---
 compiler/codeGen/ClosureInfo.lhs  |    2 +-
 compiler/codeGen/StgCmmBind.hs    |   17 ++++++++++-------
 compiler/codeGen/StgCmmClosure.hs |    2 +-
 rts/RaiseAsync.c                  |   10 ++++++++--
 5 files changed, 24 insertions(+), 14 deletions(-)