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)
1  2 
vswitchd/ovs-vswitchd.c
xenserver/vswitch-xen.spec

Simple merge
Simple merge