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

merge trunk
---

a87a43c8fe4dbb65ec387a29a12acd0e9b7cd7d6