[commit: ghc] master: Merge branch 'master' of ../HEAD (4450cc7)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4450cc7f05c65544514c28aca12a79f78ecf75fb

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

commit 4450cc7f05c65544514c28aca12a79f78ecf75fb
Merge: 8bbdab1... b8bfab8...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jul 10 16:20:49 2012 +0100

    Merge branch 'master' of ../HEAD

 compiler/typecheck/TcDeriv.lhs |   55 ++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 24 deletions(-)