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)
Conflicts:
compiler/vectorise/Vectorise/Type/PRepr.hs

1  2 
compiler/deSugar/DsMonad.lhs
compiler/ghc.cabal.in
compiler/vectorise/Vectorise/Type/Env.hs

Simple merge