[deployment-guide/comm-rel: 482/727] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[Jaromir Hradilek]

commit d23a49016f47ed8a3faf34bf7683fca9d9774b96
Merge: 90019dc... 039c0a0...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Aug 25 14:31:04 2010 +0200

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

 en-US/Authentication_Configuration.xml |    4 +-
 en-US/FTP.xml                          |  101 ++++++++++++++++----------------
 en-US/Samba.xml                        |    2 +-
 3 files changed, 53 insertions(+), 54 deletions(-)
---