From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 9 Sep 2011 20:21:23 +0000 (+0100)
Subject: Merge trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6554f92989f0da06d9e5dec092ce9a6d2e306f8c;p=openstack-build%2Fneutron-build.git

Merge trunk
---

6554f92989f0da06d9e5dec092ce9a6d2e306f8c