[commit: ghc] master: Merge remote branch 'origin/master' (e547763)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e547763831119858a06f99cda885ab9f96681394

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

commit e547763831119858a06f99cda885ab9f96681394
Merge: d4780d4... 6ac1eeb...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed May 4 23:10:42 2011 +0100

    Merge remote branch 'origin/master'

 compiler/basicTypes/Var.lhs         |    3 +-
 compiler/iface/IfaceSyn.lhs         |  459 ++++++++++++++++++-----------------
 compiler/llvmGen/LlvmCodeGen/Ppr.hs |   31 +--
 compiler/llvmGen/LlvmMangler.hs     |   68 ++++--
 compiler/main/DriverPhases.hs       |    4 -
 compiler/main/DriverPipeline.hs     |   14 +-
 compiler/main/DynFlags.hs           |    9 +-
 compiler/main/GhcMonad.hs           |    4 +-
 compiler/main/SysTools.lhs          |    2 +-
 9 files changed, 305 insertions(+), 289 deletions(-)