Merge branch 'master' into fix#5464
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 4 Oct 2011 14:26:50 +0000 (15:26 +0100)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 4 Oct 2011 14:26:50 +0000 (15:26 +0100)
1  2 
compiler/typecheck/TcInstDcls.lhs

Simple merge