[deployment-guide/comm-rel-14: 634/677] Merge branch 'master' into ent

[Jaromir Hradilek]

commit c3a5f43834b35355f69a096b6164fe4d27b2fbf1
Merge: c27a607... a4474e0...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Mon Oct 25 13:59:12 2010 +0200

    Merge branch 'master' into ent

 .../Lightweight_Directory_Access_Protocol_LDAP.xml |   22 +++++++++++++++++--
 en-US/The_Apache_HTTP_Server.xml                   |    2 +-
 en-US/images/authentication_configuration.png      |  Bin 0 -> 24892 bytes
 3 files changed, 20 insertions(+), 4 deletions(-)
---