Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:04:30 +0000 (16:04 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:04:30 +0000 (16:04 +0100)
commit8bbdab1852beda96213ab18d228eb7a1002cedb6
tree3acf0197801b2b9c259149e90ef5e1a7f5f47154
parent3fe3ef509627cb8c9aa7751beb44d1b4408f8b22
parent713cf473de8a2ad7d0b8195d78860c25fec41839
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/typecheck/TcRnDriver.lhs
compiler/iface/MkIface.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcRnDriver.lhs