[openstack-cinder/f19: 2/2] Merge branch 'master' into f19

[Pádraig Brady]

commit b2edc73d3f42098e0e616f4cac68da6f687965eb
Merge: cf8875f a8ced92
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sun Apr 7 02:46:37 2013 +0100

    Merge branch 'master' into f19

 ...e-don-t-access-the-net-when-building-docs.patch |    4 ++--
 ...ecated-assert_unicode-sqlalchemy-attribut.patch |    5 +----
 openstack-cinder.spec                              |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
---