From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 2 Aug 2011 00:47:16 +0000 (-0700)
Subject: merging branch for bug802772, which this branch is stacked on top of
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f7ad4cd852569585bf65ac09e417e70b37ed78b0;p=openstack-build%2Fneutron-build.git

merging branch for bug802772, which this branch is stacked on top of
---

f7ad4cd852569585bf65ac09e417e70b37ed78b0