[commit: ghc] overlapping-tyfams: Merge commit '8366792' into overlapping-tyfams (835b26f)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/835b26ff41c98b6937f592504cce225eaf308aea

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

commit 835b26ff41c98b6937f592504cce225eaf308aea
Merge: 68db35e 8366792
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 23:20:08 2013 +0100

    Merge commit '8366792' into overlapping-tyfams