[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (3fc1acd)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3fc1acd0d5896782837325dc982305431c30e601

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

commit 3fc1acd0d5896782837325dc982305431c30e601
Merge: d58481f... 503b265...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Feb 12 13:56:29 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 compiler/hsSyn/HsDecls.lhs          |    1 +
 compiler/typecheck/TcInstDcls.lhs   |  245 ++++++++---------------------------
 compiler/typecheck/TcTyClsDecls.lhs |   69 +++--------
 compiler/typecheck/TcValidity.lhs   |  156 +++++++++++++++++++++-
 compiler/types/FamInstEnv.lhs       |    5 +-
 5 files changed, 224 insertions(+), 252 deletions(-)