From: Brad Hall <bhall@nicira.com>
Date: Mon, 6 Jun 2011 21:17:43 +0000 (-0700)
Subject: Merge changes from quantum-framework
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1f5e880341091b56fb0caf5f1ee02d4523b14679;p=openstack-build%2Fneutron-build.git

Merge changes from quantum-framework
---

1f5e880341091b56fb0caf5f1ee02d4523b14679