Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 5 May 2011 06:11:52 +0000 (08:11 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 5 May 2011 06:11:52 +0000 (08:11 +0200)
commitea94a66d93047a9b0cd4532645eb1e9be04888e1
tree3bbc0136edc46b047a8d54b26d0646e09fb71f89
parentffabe3acb2d30be0c8e89e139f5bca7a1eb900f6
parent51fd4a1db15971e8eb46a2d665dc3f1572b95653
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
compiler/iface/IfaceSyn.lhs
compiler/typecheck/TcSMonad.lhs
compiler/deSugar/Check.lhs
compiler/iface/IfaceSyn.lhs
compiler/main/DynFlags.hs
compiler/typecheck/TcSMonad.lhs