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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3b528914877a8d45c2487988f05e6ecc092bebf1

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

commit 3b528914877a8d45c2487988f05e6ecc092bebf1
Merge: ebd7226... 7679603...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 25 15:34:01 2012 +0100

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

 ghc.mk               |    2 +-
 ghc/InteractiveUI.hs |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)