Merge /Users/benl/devel/ghc/ghc-head-devel
authorBen Lippmeier <benl@ouroborus.net>
Thu, 17 Nov 2011 01:34:57 +0000 (12:34 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 17 Nov 2011 01:34:57 +0000 (12:34 +1100)
commite194712ddadef0f09898a85613a7956b63ff5a6b
tree713a93fdddf45b38a877b93b4b3b363f0f30587e
parented4252cf7a3f2fdc022f0644e34625b504dc9923
parent71fee325bee7657e30a193ee0261d72f5175cb8e
Merge /Users/benl/devel/ghc/ghc-head-devel

Conflicts:
compiler/vectorise/Vectorise/Type/PRepr.hs
compiler/deSugar/DsMonad.lhs
compiler/ghc.cabal.in
compiler/vectorise/Vectorise/Type/Env.hs