[deployment-guide/comm-rel: 125/727] Merge branch 'master' into ent

Tue Oct 19 12:34:43 UTC 2010

commit 0f74e37d7aa20bd51d2efb5abbaffd0cfb19a9ec
Merge: d37fb9f... 08527c9...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Thu Jul 22 23:12:50 2010 +0200

    Merge branch 'master' into ent

 en-US/ABRT.xml                    |    2 +-
 en-US/Automated_Tasks.xml         |  356 ++++---
 en-US/Deployment_Guide.ent        |    2 +-
 en-US/SSSD.xml                    |   18 +-
 en-US/The_proc_File_System.xml    |  195 ++--
 en-US/The_sysconfig_Directory.xml | 2126 +++++++++++++++++++++++--------------
 en-US/Users_and_Groups.xml        |    2 +-
 en-US/Yum.xml                     |   40 +-
 8 files changed, 1724 insertions(+), 1017 deletions(-)
---