Merged quantum trunk

diff --cc quantum/db/api.py
index 2b7167ba8d40bebe1896bc0ca1ccab3efd14984f,436df84152becce8ec164e489a84bc4b81cbcedc..8153bd9dae6fe337b78aba83b0bc009624e243ae
--- 1/quantum/db/api.py
--- 2/quantum/db/api.py
+++ b/quantum/db/api.py
@@@ -20,10 -20,9 +20,10 @@@
  from sqlalchemy import create_engine
  from sqlalchemy.orm import sessionmaker, exc
  
- 
+ from quantum.common import exceptions as q_exc
  from quantum.db import models
  
 +
  _ENGINE = None
  _MAKER = None
  BASE = models.BASE

diff --cc quantum/plugins/SamplePlugin.py
Simple merge

diff --cc tests/unit/test_api.py
Simple merge

diff --cc tools/pip-requires
index baf065da290ef136d92ef18158e13f9d9a56f363,fc1b29f9fd80e252f86ee82df52507d524d8ebf9..31b66c77feb139a34cc08e5fbd5b6411a12cc458
--- 1/tools/pip-requires
--- 2/tools/pip-requires
+++ b/tools/pip-requires
@@@ -3,9 -3,9 +3,9 @@@ Routes>=1.12.
  nose
  Paste
  PasteDeploy
- pep8==0.5.0
+ pep8>=0.5.0
  python-gflags
 -sqlalchemy
  simplejson
 +sqlalchemy
  webob
  webtest