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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2742aa780a909b633c693273a86678a6cbe0a637

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

commit 2742aa780a909b633c693273a86678a6cbe0a637
Merge: 4f8e86b... 24d9d10...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jun 12 08:42:49 2012 +0100

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

 compiler/main/DynFlags.hs        |   30 +++++++++++++++---------------
 compiler/main/HscMain.hs         |   16 ++++++++--------
 compiler/main/HscTypes.lhs       |   22 +++++++++++-----------
 compiler/typecheck/TcRnTypes.lhs |    5 +++--
 ghc/InteractiveUI.hs             |    2 +-
 5 files changed, 38 insertions(+), 37 deletions(-)