[commit: ghc] tc-untouchables: Merge branch 'tc-untouchables', remote branch 'origin' into tc-untouchables (740cbdf)

[Simon Peyton Jones]

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

On branch  : tc-untouchables

http://hackage.haskell.org/trac/ghc/changeset/740cbdf938f4c36e2f99bd3ea1ce48e622e4e0fa

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

commit 740cbdf938f4c36e2f99bd3ea1ce48e622e4e0fa
Merge: fe6ddf0... b660cc0...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Sep 1 20:51:51 2012 +0100

    Merge branch 'tc-untouchables', remote branch 'origin' into tc-untouchables

 ghc/ghc.mk           |    4 ++--
 utils/ghc-pkg/ghc.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)