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)
Solved conflicts:
compiler/typecheck/TcGenDeriv.lhs


Trivial merge