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

[Pádraig Brady]

commit 15f7017bba3658a3a5e10129cf0d31d8e33c2d2a
Merge: a4794d7 ebdc1ff
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Apr 3 16:38:16 2013 +0100

    Merge branch 'master' into f19

 ...ecated-assert_unicode-sqlalchemy-attribut.patch |  129 ++++++++++++++++++++
 1 files changed, 129 insertions(+), 0 deletions(-)
---