From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 25 Aug 2011 22:49:10 +0000 (+0100)
Subject: Merge trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6e160e74b5d8b4f6fb864ce70cadb19037931a87;p=openstack-build%2Fneutron-build.git

Merge trunk
Sorted "ghost" conflict in etc/quantum.conf
---

6e160e74b5d8b4f6fb864ce70cadb19037931a87