[commit: ghc] master: Merge branch 'master' of mac:ghc/git/val32/. (65fc37a)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/65fc37a798cb3220b32eee6fb2115301f112a015

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

commit 65fc37a798cb3220b32eee6fb2115301f112a015
Merge: 690f7ec... 676bc14...
Author: Ian Lynagh <igloo at earth.li>
Date:   Mon Jun 27 13:54:40 2011 +0100

    Merge branch 'master' of mac:ghc/git/val32/.

 rts/Trace.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)