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

[Jaromir Hradilek]

commit d34eb5846c4be7fda243de4b2a84541a8b50a42f
Merge: c3a5f43... 9b385c4...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Oct 26 12:39:45 2010 +0200

    Merge branch 'master' into ent

 .../Lightweight_Directory_Access_Protocol_LDAP.xml |  113 +++++---------------
 en-US/The_Apache_HTTP_Server.xml                   |   12 +-
 2 files changed, 33 insertions(+), 92 deletions(-)
---