From: Dimitrios Vytiniotis <dimitris@microsoft.com>
Date: Wed, 18 May 2011 13:12:46 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=febf1ced754a3996ac1a5877dcded87828560d1c;hp=febf1ced754a3996ac1a5877dcded87828560d1c;p=ghc-hetmet.git

Merge remote branch 'origin/master'

Fixed conflicts in:
	compiler/typecheck/TcCanonical.lhs
	compiler/typecheck/TcErrors.lhs
	compiler/typecheck/TcInteract.lhs
---