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

[Jaromir Hradilek]

commit 82afdee3a0b863138fb28b60681f01fb7302a183
Merge: 323c5b1 ff7f5f9
Author: Martin Prpic <mprpic at redhat.com>
Date:   Tue Jan 25 16:54:18 2011 +0100

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

 en-US/OpenLDAP.xml |  259 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 241 insertions(+), 18 deletions(-)
---