[commit: template-haskell] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (b006d7e)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

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

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

commit b006d7e9251cac5588d71206624ef3600af9c47c
Merge: aeca864... e4f742d...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 14:09:55 2013 +0100

    Merge branch 'master' into overlapping-tyfams