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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/58b96047fefcda4a72d8f07823cce9ea8b6ad98a

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

commit 58b96047fefcda4a72d8f07823cce9ea8b6ad98a
Merge: 6c00355... c1f01e3...
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jul 14 16:07:51 2012 +0100

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

 compiler/prelude/PrelRules.lhs      |    5 +++++
 compiler/typecheck/TcHsType.lhs     |    1 +
 compiler/typecheck/TcRnMonad.lhs    |    5 -----
 compiler/typecheck/TcSimplify.lhs   |    7 ++++---
 compiler/typecheck/TcTyClsDecls.lhs |   17 ++++++++++++++++-
 compiler/types/Class.lhs            |   25 +++++++++++++++++++++----
 6 files changed, 47 insertions(+), 13 deletions(-)