Merge commit 'origin/citrix'
authorJustin Pettit <jpettit@nicira.com>
Wed, 29 Jul 2009 05:16:50 +0000 (22:16 -0700)
committerJustin Pettit <jpettit@nicira.com>
Wed, 29 Jul 2009 05:16:50 +0000 (22:16 -0700)
commita5e54d9b6f8002f34cc792df69e6eda68cf95223
tree5667dbde61b4f79f86dd04a5bc1be2c8ea9731bf
parent4cff83cbad9c0ccd8575a001c7345066a2e6fa00
parent3cdc31a4c3ab312cf41b00845d1316aff181ab1b
Merge commit 'origin/citrix'

Conflicts:

configure.ac
debian/openvswitch-switch-config.templates
debian/openvswitch-switch.init
debian/openvswitch-switch.template
debian/po/templates.pot
lib/socket-util.c
lib/vconn.c
utilities/ovs-controller.8.in
utilities/ovs-ofctl.8.in
utilities/ovs-openflowd.8.in
vswitchd/bridge.c
vswitchd/ovs-vswitchd.conf.5.in