commit 81f3ca97953a7f4631114a703ef57756cfb1f3c4 Merge: 037e961... 383a173... Author: Douglas Silas <dhensley at redhat.com> Date: Mon Jun 28 20:55:35 2010 +0200 Merge branch 'ent' into ent-rel en-US/Network_Configuration.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---