From: Dan Wendlandt <dan@nicira.com>
Date: Sat, 6 Aug 2011 06:12:32 +0000 (-0700)
Subject: another merge
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=57d1df9b2beddb6f8e19022832567c4444a8c819;p=openstack-build%2Fneutron-build.git

another merge
---

57d1df9b2beddb6f8e19022832567c4444a8c819