Merge remote-tracking branch 'origin/master' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 17 Sep 2012 12:09:22 +0000 (13:09 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 17 Sep 2012 12:09:22 +0000 (13:09 +0100)
commitb0db9308017fc14b600b3a85d9c55a037f12ee9e
treeb51b0b9d26b328b5e14e9d4d681219483f9c9b1f
parent633dd5589f8625a8771ac75c5341ea225301d882
parent8c3b9aca3aaf946a91c9af6c07fc9d2afb6bbb76
Merge remote-tracking branch 'origin/master' into tc-untouchables

Conflicts:
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcUnify.lhs
compiler/types/Type.lhs