[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (04abb49)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/04abb495bbc2b2ac99f5d2a6eb6193e21cd3fe0a

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

commit 04abb495bbc2b2ac99f5d2a6eb6193e21cd3fe0a
Merge: e39539d... f61fbf3...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 18 14:31:59 2013 +0000

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

 libraries/primitive |    1 +
 libraries/vector    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)