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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit e4a77504c3c5c39eeec191006cb11000b18c2d15
Merge: cd54b70... e841f7a...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 12 08:48:07 2011 +0100

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

 docs/users_guide/debugging.xml |    5 +++--
 docs/users_guide/flags.xml     |    6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)