Merge remote branch 'origin/master' into ghc-new-co
[ghc-hetmet.git] / compiler / typecheck / TcEnv.lhs-boot
2006-12-11 Pepe IborraAdjust code from manual merges