Merge commit 'origin/citrix'
authorJustin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
committerJustin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 18:31:37 +0000 (11:31 -0700)
commite3fdfed11b8c56aa6a8deffe11a552fed7e7adbc
treeea1bdad12f58bda91335d4e332ad1f7945770473
parent7793a4aaeb0d550d71fab4b7a5c075b0526c8b05
parent952efc486da04bcb8c9d6ad01383e28632b7d140
Merge commit 'origin/citrix'
vswitchd/ovs-vswitchd.c
xenserver/vswitch-xen.spec