[commit: ghc] fix#5464: Merge branch 'fix#5464' of http://darcs.haskell.org/ghc into fix#5464 (8224782)

[José Pedro Magalhães]

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

On branch  : fix#5464

http://hackage.haskell.org/trac/ghc/changeset/8224782104e8ec8ad9300655d8ae77e45b952453

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

commit 8224782104e8ec8ad9300655d8ae77e45b952453
Merge: c93690d... 7bde01d...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Mon Sep 26 11:14:52 2011 +0200

    Merge branch 'fix#5464' of http://darcs.haskell.org/ghc into fix#5464
    
    Solved conflicts:
    	compiler/typecheck/TcGenDeriv.lhs