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

[Ian Lynagh]

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

On branch  : master

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

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

commit d2d71b0e0bdfb5128d68a886a8cbec11c4cf34ee
Merge: ecc1882 ca39e77
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Mar 16 22:58:02 2013 +0000

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

 compiler/main/GHC.hs              |  2 ++
 compiler/main/HscMain.hs          |  2 +-
 compiler/main/InteractiveEval.hs  | 16 +++++++++++-----
 compiler/typecheck/TcRnDriver.lhs | 33 ++++++++++++++++++++++-----------
 compiler/typecheck/TcType.lhs     |  2 +-
 compiler/types/FamInstEnv.lhs     | 14 +++++++++++++-
 compiler/types/InstEnv.lhs        | 13 ++++++++++++-
 ghc/InteractiveUI.hs              | 16 ++++++++++------
 8 files changed, 72 insertions(+), 26 deletions(-)