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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/336a7698927ccf5f278b2fed56664f13169dbc65

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

commit 336a7698927ccf5f278b2fed56664f13169dbc65
Merge: 2f08f70... b4b7863...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Aug 23 16:36:08 2012 +0100

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

 compiler/main/DriverPipeline.hs   |   20 +++++++++-----
 compiler/main/GHC.hs              |    6 ++++
 compiler/main/HscMain.hs          |   38 ++++++++++++++++++-------
 compiler/nativeGen/PPC/CodeGen.hs |    8 +++---
 ghc/InteractiveUI.hs              |   54 ++++++++++++------------------------
 5 files changed, 68 insertions(+), 58 deletions(-)