[commit: ghc] ghc-kinds: Merge branch 'master' into ghc-kinds (59a94ff)

[Julien Cretin]

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

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/59a94ff7c781aba9f9451a50e1fda20d66dc4e52

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

commit 59a94ff7c781aba9f9451a50e1fda20d66dc4e52
Merge: d51c28d... 99a6412...
Author: Julien Cretin <ghc at ia0.eu>
Date:   Wed Sep 14 22:28:15 2011 +0200

    Merge branch 'master' into ghc-kinds

 compiler/typecheck/TcDeriv.lhs    |   67 +++++++++++++++++++++++++++----------
 compiler/typecheck/TcGenDeriv.lhs |   19 ++++++----
 2 files changed, 60 insertions(+), 26 deletions(-)