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

[Jaromir Hradilek]

commit 6083b1bda4babddebe917b255c4f2e8cfb156a32
Merge: 8ec67d2 5350535
Author: Martin Prpic <mprpic at redhat.com>
Date:   Fri Jan 28 15:03:09 2011 +0100

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

 en-US/Deployment_Guide.ent |    2 +-
 en-US/OpenLDAP.xml         |   39 +++++++--------------------------------
 2 files changed, 8 insertions(+), 33 deletions(-)
---