Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 30 Jan 2011 01:19:44 +0000 (17:19 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 30 Jan 2011 01:19:44 +0000 (17:19 -0800)
commit7c5c9ca0a76d1abb158075b1c4a37f9c6b9c097a
tree9c29fc11b34d069ff6821028e2cdab843c7f8b3d
parent282ce88d745d8f892a3e9f2d8ee98dc24966fad6
parent7eb9cce3caca822cbbe1fa3a31ff0b4e0df3c369
Merge branch 'master' into type-nats

Conflicts:
compiler/typecheck/TcType.lhs
compiler/codeGen/StgCmmClosure.hs
compiler/ghc.cabal.in
compiler/main/DynFlags.hs
compiler/typecheck/TcType.lhs
compiler/typecheck/TcUnify.lhs