commit cbe9d59b01a40fcefffeac989efebcd2e990f8a5 Merge: 383a173... e3563aa... Author: Douglas Silas <dhensley at redhat.com> Date: Tue Jul 6 18:14:15 2010 +0200 Merge branch 'master' into ent en-US/Samba.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---