Merge commit 'origin/citrix'

author Justin Pettit <jpettit@nicira.com>

Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)

committer Justin Pettit <jpettit@nicira.com>

Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
author Justin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
committer Justin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
diff --cc datapath/datapath.c
Simple merge
diff --cc lib/rconn.c
Simple merge
diff --cc vswitchd/ovs-vswitchd.conf.5.in
Simple merge
diff --cc xenserver/vswitch-xen.spec
Simple merge
author	Justin Pettit <jpettit@nicira.com>
	Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
committer	Justin Pettit <jpettit@nicira.com>
	Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
		1	2
datapath/datapath.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/rconn.c	patch \|	diff1 \|	diff2 \|	blob \| history
vswitchd/ovs-vswitchd.conf.5.in	patch \|	diff1 \|	diff2 \|	blob \| history
xenserver/vswitch-xen.spec	patch \|	diff1 \|	diff2 \|	blob \| history