From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 29 Jul 2009 05:16:50 +0000 (-0700)
Subject: Merge commit 'origin/citrix'
X-Git-Tag: v0.99.0~133^2~35
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=a5e54d9b6f8002f34cc792df69e6eda68cf95223

Merge commit 'origin/citrix'

Conflicts:

	configure.ac
---

a5e54d9b6f8002f34cc792df69e6eda68cf95223