Merge commit 'origin/citrix'
authorJustin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
committerJustin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
1  2 
datapath/datapath.c
lib/rconn.c
vswitchd/ovs-vswitchd.conf.5.in
xenserver/vswitch-xen.spec

Simple merge
diff --cc lib/rconn.c
Simple merge
Simple merge
Simple merge