Merge branch 'fix#5464' of http://darcs.haskell.org/ghc into fix#5464
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 26 Sep 2011 09:14:52 +0000 (11:14 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 26 Sep 2011 09:14:52 +0000 (11:14 +0200)
commit8224782104e8ec8ad9300655d8ae77e45b952453
tree7f8d36d6bd94818ad2de72c9fb921c062054f0e2
parentc93690df31d295842e810ef1e92ae725d840f2ac
parent7bde01d32b8ef761bdf07c3339d7e496574d9905
Merge branch 'fix#5464' of darcs.haskell.org/ghc into fix#5464

Solved conflicts:
compiler/typecheck/TcGenDeriv.lhs