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

[dimitris at microsoft.com]

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

On branch  : master

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

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

commit f644a1caeb3bf1f65752102ee74daecacbded199
Merge: 107715b... d0faaa6...
Author: Dimitrios Vytiniotis <dimitris at microsoft.com>
Date:   Wed Jun 8 18:27:25 2011 +0100

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

 compiler/codeGen/CgPrimOp.hs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)