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

[Ian Lynagh]

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

On branch  : master

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

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

commit f426eef1e98ec35f8123e1b32400f3ab41ba3d71
Merge: 6942b11... be6810b...
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jul 27 19:57:24 2011 +0100

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

 compiler/basicTypes/VarEnv.lhs    |   12 ++++++++----
 compiler/coreSyn/CoreSubst.lhs    |    4 ++--
 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 +++
 7 files changed, 48 insertions(+), 31 deletions(-)