[commit: ghc] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc (e56b9d5)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/e56b9d5979b0ac5ca8e53170985734b2c340be4a

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

commit e56b9d5979b0ac5ca8e53170985734b2c340be4a
Merge: fb96f13 7f65874
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 28 17:28:16 2013 +0100

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

 compiler/typecheck/TcInteract.lhs | 85 +++++++++++++++++++++++----------------
 compiler/typecheck/TcSMonad.lhs   | 42 +------------------
 2 files changed, 52 insertions(+), 75 deletions(-)