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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit d4ded7a08ef589c9077c9cf78bab96fc5b56a604
Merge: 406a369... e06ffb5...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jul 22 08:57:46 2011 +0100

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

 docs/users_guide/safe_haskell.xml |    6 ++++++
 rts/Trace.h                       |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)