[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (5700479)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5700479b68aa96f380c44d3a085786b1fdbff3d8

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

commit 5700479b68aa96f380c44d3a085786b1fdbff3d8
Merge: eaab794... 767663b...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Feb 19 14:46:21 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/codeGen/StgCmmPrim.hs      |    4 ++++
 compiler/ghc.mk                     |    6 +++---
 compiler/prelude/PrelRules.lhs      |    9 +++++++++
 compiler/prelude/primops.txt.pp     |   11 +++++++++++
 compiler/vectorise/Vectorise/Exp.hs |   11 ++++++++---
 includes/stg/MiscClosures.h         |    1 +
 mk/config.mk.in                     |    1 -
 mk/custom-settings.mk               |    2 +-
 8 files changed, 37 insertions(+), 8 deletions(-)