Merge "master" into "xs5.7".
authorBen Pfaff <blp@nicira.com>
Wed, 7 Oct 2009 17:21:49 +0000 (10:21 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 7 Oct 2009 17:21:49 +0000 (10:21 -0700)
commitfd8b8de056a3deb484bcfabeba183bf1080a8546
treecbeddb5229762c3d3be33c5b581b42f64330ac60
parent879ce26627323e5139629985cd72ab15758b5853
parent417a8cb6a6f6f16a7ddf35435079b20f78081bd1
Merge "master" into "xs5.7".

This makes ovs-vsctl work and thus should make it possible to start VMs
See commit 417a8cb6a "xenserver: Fix ovs-vsctl in built RPM by defining
/etc as sysconfdir" for more details.
xenserver/vswitch-xen.spec