[commit: ghc] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (99e3dd7)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/99e3dd764e54ec513a0d8f162e2ead9813f46ca3

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

commit 99e3dd764e54ec513a0d8f162e2ead9813f46ca3
Merge: c286f62 569b265
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 14:10:17 2013 +0100

    Merge branch 'master' into overlapping-tyfams