Merge remote branch 'origin/master' into zvm

author Dan Williams <dcbw@redhat.com>

Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)

committer Dan Williams <dcbw@redhat.com>

Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)
author Dan Williams <dcbw@redhat.com>
Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)
committer Dan Williams <dcbw@redhat.com>
Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)
diff --cc system-settings/plugins/ifcfg-rh/reader.c
Simple merge
diff --cc system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
Simple merge
diff --cc system-settings/plugins/ifcfg-rh/writer.c
Simple merge
author	Dan Williams <dcbw@redhat.com>
	Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)
committer	Dan Williams <dcbw@redhat.com>
	Wed, 28 Jul 2010 06:24:10 +0000 (23:24 -0700)
		1	2
system-settings/plugins/ifcfg-rh/reader.c	patch \|	diff1 \|	diff2 \|	blob \| history
system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c	patch \|	diff1 \|	diff2 \|	blob \| history
system-settings/plugins/ifcfg-rh/writer.c	patch \|	diff1 \|	diff2 \|	blob \| history