Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 12 Feb 2012 21:29:29 +0000 (13:29 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 12 Feb 2012 21:29:29 +0000 (13:29 -0800)
commitcfd89e12334e7dbcc8d9aaee898bcc38b77f549b
tree44510e960a6ac31c88219010052ea9b2e5d7217d
parent5851f84733f4ef1ee158b911febd753ced619555
parent86ebfef9a5acc60b7a2ce3c8f025e6e707f17f87
Merge remote-tracking branch 'origin/master' into type-nats

Conflicts:
compiler/coreSyn/CoreLint.lhs
compiler/coreSyn/CoreLint.lhs
compiler/parser/Parser.y.pp
compiler/rename/RnTypes.lhs
compiler/typecheck/TcHsType.lhs
compiler/types/FamInstEnv.lhs
compiler/types/Kind.lhs
mk/validate-settings.mk