[deployment-guide/comm-rel: 539/727] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[Jaromir Hradilek]

commit 4b5538f0262f0885225449147dd052d22901d234
Merge: ac11c4c... 9ebc768...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Tue Aug 31 22:03:46 2010 +0200

    Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide

 en-US/Email.xml                  |   38 ++-
 en-US/The_Apache_HTTP_Server.xml |  851 ++++++++++++++++++++++++--------------
 2 files changed, 582 insertions(+), 307 deletions(-)
---