Merge "master" into xs5.7.
authorBen Pfaff <blp@nicira.com>
Mon, 5 Oct 2009 17:32:38 +0000 (10:32 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 5 Oct 2009 17:32:38 +0000 (10:32 -0700)
commit879ce26627323e5139629985cd72ab15758b5853
treece1fe13ef3624aa9524c3270c88dff12ddae25d4
parent95f340cb191dd52a0be28176b009b5e5bca81cd9
parent4d678233e981fa319a338f6b0949e9dc625941a4
Merge "master" into xs5.7.
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif