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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/632f2b2918927543630959252f5f7f4111567689

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

commit 632f2b2918927543630959252f5f7f4111567689
Merge: 3d47d0b... 66878b1...
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jun 25 19:51:12 2011 +0100

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

 compiler/llvmGen/LlvmMangler.hs |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)