[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (6571f4f)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6571f4f110248221fb3fa0ac8e5b2584cb2c5b84

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

commit 6571f4f110248221fb3fa0ac8e5b2584cb2c5b84
Merge: 4430227... c08295a...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Feb 13 17:42:43 2013 +0000

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

 compiler/coreSyn/CoreUtils.lhs    |    6 ++-
 compiler/typecheck/TcGenDeriv.lhs |  117 +++++++++++++++++--------------------
 2 files changed, 58 insertions(+), 65 deletions(-)