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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit bf069cbea44aa79e4053b89664d27f609b3eb538
Merge: 71ae069... 5943886...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 29 09:00:25 2013 +0000

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

 compiler/typecheck/TcInstDcls.lhs   |  239 ++++++++++++++++++++++-------------
 compiler/typecheck/TcTyClsDecls.lhs |   37 ------
 2 files changed, 154 insertions(+), 122 deletions(-)