[openstack-glance/el6: 2/2] Merge branch 'f16' into el6

[Russell Bryant]

commit 43dc42f90c6a178d7a769b223041d182c0c25edf
Merge: 029a691 4b9c056
Author: Russell Bryant <rbryant at redhat.com>
Date:   Thu Jan 26 10:58:05 2012 -0500

    Merge branch 'f16' into el6

 openstack-glance.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc openstack-glance.spec
index c2405c9,92702e2..b0639fa
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -60,10 -57,10 +60,11 @@@ Requires:         python-eventle
  Requires:         python-kombu
  Requires:         python-paste-deploy
  Requires:         python-routes
 -Requires:         python-sqlalchemy
 -Requires:         python-webob
 +Requires:         python-sqlalchemy0.7
 +Requires:         python-webob1.0
 +Requires:         python-setuptools
  Requires:         python-httplib2
+ Requires:         python-migrate
  
  #
  # The image cache requires this http://pypi.python.org/pypi/xattr