Merge master branch into xs5.7.
authorBen Pfaff <blp@nicira.com>
Wed, 18 Nov 2009 22:26:55 +0000 (14:26 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 18 Nov 2009 22:26:55 +0000 (14:26 -0800)
commitdac3c52f893f7df16f935ef4875c5467abd4ea23
treeec277b5a3afa5fea6df42b31e9478e5a318f1b58
parentc07686a4b073aa2092a0653a3fa92bb78688e090
parentd17ee8689bff22541dccaa792b70a848641f3646
Merge master branch into xs5.7.

Conflicts:
xenserver/README
xenserver/automake.mk
xenserver/etc_xensource_scripts_vif
xenserver/usr_share_vswitch_scripts_dump-vif-details
xenserver/vswitch-xen.spec
xenserver/README
xenserver/automake.mk
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif
xenserver/vswitch-xen.spec