[commit: haddock] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (acc3e9c)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

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

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

commit acc3e9c7928f3159e53e31195cb4505c40d23394
Merge: 66a142f... ce3ff85...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 14:09:08 2013 +0100

    Merge branch 'master' into overlapping-tyfams