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

[Pádraig Brady]

commit a4794d7f413b5d311623a6ab91fbf93767f67e19
Merge: 8e3b691 7e6c4bc
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Apr 2 16:31:36 2013 +0100

    Merge branch 'master' into f19
    
    Conflicts:
    	openstack-cinder.spec

 openstack-cinder.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---