From: Ben Pfaff <blp@nicira.com>
Date: Mon, 15 Jun 2009 23:04:54 +0000 (-0700)
Subject: Merge changes from citrix branch into master.
X-Git-Tag: v0.90.1~2
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=34e63086edddcae06d7c1a4fa84fec0861e50758

Merge changes from citrix branch into master.
---

34e63086edddcae06d7c1a4fa84fec0861e50758