Merge commit 'origin/citrix'
authorJustin Pettit <jpettit@nicira.com>
Sat, 12 Sep 2009 07:49:30 +0000 (00:49 -0700)
committerJustin Pettit <jpettit@nicira.com>
Sat, 12 Sep 2009 07:49:30 +0000 (00:49 -0700)
commit39fb08818bbd9c438dbf23caa89937c663451b5a
treea317d5161f3a7efd4e6e7cc5ccbf54d6807e5fe7
parent6867bc3633fc5734eb81cd8684f0fed5df319bdd
parent7646deb6ec8c3a319573ac9ea9a19a60994f7cf3
Merge commit 'origin/citrix'

Conflicts:
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
lib/automake.mk
lib/vconn.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch