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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/86d41b13a7d07b563d4222a17eb5cfb61c3c0775

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

commit 86d41b13a7d07b563d4222a17eb5cfb61c3c0775
Merge: 2b85372 2bd278d
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Mar 4 00:40:38 2013 +0000

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

 compiler/typecheck/TcCanonical.lhs | 150 +++++++++++++++++++------------------
 compiler/typecheck/TcInteract.lhs  |   1 +
 compiler/typecheck/TcRnTypes.lhs   |  33 +++++---
 compiler/typecheck/TcSMonad.lhs    |   5 +-
 compiler/types/Kind.lhs            |   9 ++-
 5 files changed, 114 insertions(+), 84 deletions(-)