From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Tue, 30 Aug 2011 16:06:19 +0000 (+0100)
Subject: merge trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fff680ee63c6c9b4caa8198a255cda2bd0fd19c3;p=openstack-build%2Fneutron-build.git

merge trunk
---

fff680ee63c6c9b4caa8198a255cda2bd0fd19c3