[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (73dd57e)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/testsuite/commit/73dd57e0e82e0cafee6ca7d43f17f0e7167e1aac

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

commit 73dd57e0e82e0cafee6ca7d43f17f0e7167e1aac
Merge: f1d2176... 91e974f...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 14:09:31 2013 +0100

    Merge branch 'master' into overlapping-tyfams