Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Sun, 23 Dec 2012 15:49:29 +0000 (15:49 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sun, 23 Dec 2012 15:49:29 +0000 (15:49 +0000)
commite5ccb4ee127c55a6a834cc65f28f202af773d93e
tree171e9e286447f042ef97885b4f3ba5520b168174
parent1ee1cd4194555e498d05bfc391b7b0e635d11e29
parentd2a5a9cfd57214ceec94130d82f95d5be45f2014
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/basicTypes/MkId.lhs
compiler/iface/IfaceSyn.lhs
compiler/basicTypes/MkId.lhs
compiler/iface/BinIface.hs
compiler/iface/IfaceSyn.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcSplice.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/vectorise/Vectorise/Generic/PData.hs