[commit: ghc] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (95633a6)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/95633a69cafc011b7277854221d82a51c28d896d

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

commit 95633a69cafc011b7277854221d82a51c28d896d
Merge: 0d0c71e efc8ad1
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue May 28 10:04:46 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 compiler/basicTypes/BasicTypes.lhs |  6 ++++--
 compiler/main/PprTyThing.hs        | 11 +++++-----
 compiler/rename/RnEnv.lhs          | 42 ++++++++++++++++++++++++--------------
 compiler/typecheck/TcGenDeriv.lhs  |  3 ++-
 compiler/typecheck/TcValidity.lhs  |  6 ++++++
 5 files changed, 45 insertions(+), 23 deletions(-)