commit 383a1738c05fb08f4548331ad0badd061a2163c5 Merge: 2d8d9e6... 10ea147... Author: Douglas Silas <dhensley at redhat.com> Date: Mon Jun 28 20:55:32 2010 +0200 Merge branch 'master' into ent en-US/Network_Configuration.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---