From: Dan Wendlandt <dan@nicira.com>
Date: Sun, 31 Jul 2011 19:01:37 +0000 (-0700)
Subject: merge branch for to fix bug817826
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=11cc083e2a4c85a3c84c84b238e81e3d49fd21a1;p=openstack-build%2Fneutron-build.git

merge branch for to fix bug817826
---

11cc083e2a4c85a3c84c84b238e81e3d49fd21a1