From: Deepak N <deepak.n@thoughtworks.com>
Date: Mon, 18 Jul 2011 10:49:11 +0000 (+0530)
Subject: Merged from quantum trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cba26a3e7ec3cc1e78c6963558d6e45fcfdbadc0;p=openstack-build%2Fneutron-build.git

Merged from quantum trunk
---

cba26a3e7ec3cc1e78c6963558d6e45fcfdbadc0
diff --cc quantum/manager.py
index 00aefc698,e64df61e3..d639ec1d3
--- a/quantum/manager.py
+++ b/quantum/manager.py
@@@ -26,11 -26,9 +26,9 @@@ The caller should make sure that Quantu
  """
  import gettext
  import os
 -
 +import logging
  gettext.install('quantum', unicode=1)
  
- import os
- 
  from common import utils
  from quantum_plugin_base import QuantumPluginBase