[deployment-guide: 23/185] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[Jaromir Hradilek]

commit 85e7a327cdc1c1e582ad3c32c627182b4305c4df
Merge: cf34e5d 3eae1df
Author: Martin Prpic <mprpic at redhat.com>
Date:   Thu Jan 20 14:27:45 2011 +0100

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

 .../Lightweight_Directory_Access_Protocol_LDAP.xml |   12 ++++++++----
 en-US/The_Apache_HTTP_Server.xml                   |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
---