From: Ben Pfaff <blp@nicira.com>
Date: Wed, 18 Nov 2009 22:14:29 +0000 (-0800)
Subject: Merge citrix branch into master.
X-Git-Tag: v0.99.0~30
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=d17ee8689bff22541dccaa792b70a848641f3646

Merge citrix branch into master.
---

d17ee8689bff22541dccaa792b70a848641f3646