commit fc527c4db6c86a55fe97e1871b3593b447982a88
Merge: 767e8b9... 9f8560f...
Author: Douglas Silas <dhensley at redhat.com>
Date: Mon Aug 30 15:17:49 2010 +0200
Merge branch 'master' into ent
en-US/ABRT.xml | 51 +-
en-US/Authentication_Configuration.xml | 8 +-
en-US/Book_Info.xml | 2 +-
en-US/Email.xml | 351 +-
en-US/FTP.xml | 115 +-
en-US/Samba.xml | 285 +-
en-US/The_Apache_HTTP_Server.xml | 5333 ++++++++++------------------
en-US/The_BIND_DNS_Server.xml | 236 +-
en-US/The_kdump_Crash_Recovery_Service.xml | 188 +-
en-US/Working_with_Kernel_Modules.xml | 52 +-
10 files changed, 2562 insertions(+), 4059 deletions(-)
---