commit efdab834c514519e7e2c4dd8628d0013d994b392 Merge: dd2e992... c90f522... Author: Douglas Silas <dhensley at redhat.com> Date: Mon Jul 19 13:11:57 2010 +0200 Merge branch 'flo' en-US/Users_and_Groups.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---