From: Dan Wendlandt <dan@nicira.com>
Date: Mon, 27 Jun 2011 16:30:08 +0000 (-0700)
Subject: merge
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cf660ee8f0235d8cbf6e38162b2e1791751a0add;p=openstack-build%2Fneutron-build.git

merge
---

cf660ee8f0235d8cbf6e38162b2e1791751a0add