From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Wed, 24 Aug 2011 11:57:03 +0000 (+0100)
Subject: Merge trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f84945bf8d206a2c4eb3e0393ff8f26162699747;p=openstack-build%2Fneutron-build.git

Merge trunk
---

f84945bf8d206a2c4eb3e0393ff8f26162699747