Merge commit 'origin/citrix'

author Justin Pettit <jpettit@nicira.com>

Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)

committer Justin Pettit <jpettit@nicira.com>

Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
author Justin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
committer Justin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
diff --cc vswitchd/ovs-vswitchd.c
Simple merge
diff --cc xenserver/vswitch-xen.spec
Simple merge
author	Justin Pettit <jpettit@nicira.com>
	Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
committer	Justin Pettit <jpettit@nicira.com>
	Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
		1	2
vswitchd/ovs-vswitchd.c	patch \|	diff1 \|	diff2 \|	blob \| history
xenserver/vswitch-xen.spec	patch \|	diff1 \|	diff2 \|	blob \| history