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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/150d292bf707de860a6ba85a174df321ed0b9d81

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

commit 150d292bf707de860a6ba85a174df321ed0b9d81
Merge: 0f6ab77... 521157f...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 2 10:19:27 2011 +0000

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

 compiler/llvmGen/LlvmMangler.hs   |    6 +++-
 compiler/nativeGen/X86/CodeGen.hs |   21 ++++++++++--------
 rts/StgCRun.c                     |   42 +++++++++++++++++++++---------------
 3 files changed, 40 insertions(+), 29 deletions(-)