[system-administrators-guide/16: 4/4] Merge branch 'master' into 16

[Jaromir Hradilek]

commit 13265536705ab210f8aba09d83fa3c242969ebdf
Merge: 63f1d7a c9ca52e
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Nov 8 00:49:30 2011 +0100

    Merge branch 'master' into 16

 en-US/System_Administrators_Guide.ent |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---