commit a596ea3ff4323b61b30b229fca69004f6fdaa818 Merge: 3925403... cbe9d59... Author: Douglas Silas <dhensley at redhat.com> Date: Tue Jul 6 18:14:32 2010 +0200 Merge branch 'ent' into ent-rel en-US/Samba.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---