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

[Ian Lynagh]

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

On branch  : master

https://github.com/ghc/ghc/commit/716c2ae49b5d0e917967507e0d6a17ca6e009218

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

commit 716c2ae49b5d0e917967507e0d6a17ca6e009218
Merge: 31b2706 6ecfa98
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Jun 11 14:54:51 2013 +0100

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

 compiler/typecheck/TcPat.lhs        |  1 +
 compiler/typecheck/TcSimplify.lhs   |  6 +--
 compiler/typecheck/TcTyClsDecls.lhs | 37 ++++++++---------
 compiler/types/Coercion.lhs         | 82 +++++++++++++++++++++++++++++++++++--
 compiler/types/Kind.lhs             | 44 ++++++++++----------
 compiler/types/Type.lhs             | 24 +++++++++--
 6 files changed, 144 insertions(+), 50 deletions(-)