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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6a29c4a0e0b5cefc767ce5d5f8648c971fc19d7b

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

commit 6a29c4a0e0b5cefc767ce5d5f8648c971fc19d7b
Merge: 7910fce... f426eef...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jul 28 08:16:23 2011 +0100

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

 compiler/basicTypes/VarEnv.lhs    |   12 ++++++++----
 compiler/coreSyn/CoreSubst.lhs    |    4 ++--
 compiler/main/DriverPipeline.hs   |   11 +++++++++++
 compiler/main/HeaderInfo.hs       |   14 +++++++-------
 compiler/main/HscMain.lhs         |    9 ++++++---
 compiler/rename/RnNames.lhs       |   16 +++++++++-------
 compiler/typecheck/TcRnDriver.lhs |   21 +++++++++++++--------
 compiler/utils/Outputable.lhs     |    3 +++
 mk/validate-settings.mk           |    5 +++++
 utils/ghc-cabal/ghc.mk            |    3 ++-
 10 files changed, 66 insertions(+), 32 deletions(-)