[commit: template-haskell] overlapping-tyfams: Merge commit 'ccd7891' into overlapping-tyfams (d1127a5)

[Richard Eisenberg]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/template-haskell

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/d1127a51db187ed4d7b558eb843dfa42fe382432

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

commit d1127a51db187ed4d7b558eb843dfa42fe382432
Merge: e2f97b1... ccd7891...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 23:31:28 2013 +0100

    Merge commit 'ccd7891' into overlapping-tyfams