[commit: ghc] master: Merge /Users/benl/devel/ghc/ghc-head-devel (b4d08f1)

[Ben Lippmeier]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b4d08f19f3da0cafefcb8281ef844d8c5f96abec

>---------------------------------------------------------------

commit b4d08f19f3da0cafefcb8281ef844d8c5f96abec
Merge: 3b045c3... 4902a27...
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu Nov 17 13:31:37 2011 +1100

    Merge /Users/benl/devel/ghc/ghc-head-devel

 compiler/vectorise/Vectorise/Builtins.hs           |    2 +-
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    6 +++++-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |    5 ++++-
 .../vectorise/Vectorise/Generic/Description.hs     |   10 ++++++++--
 compiler/vectorise/Vectorise/Generic/PAMethods.hs  |   12 ++++++------
 compiler/vectorise/Vectorise/Generic/PData.hs      |   14 +++++++-------
 6 files changed, 31 insertions(+), 18 deletions(-)