Merged from quantum trunk

diff --cc quantum/manager.py
index 00aefc698788d89963e0071f398be3aa80c00f71,e64df61e31a057aa3d567d3632ae9688fb741081..d639ec1d3c9094a13bb7e5c070c2844da8fdd990
--- 1/quantum/manager.py
--- 2/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