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

[Pádraig Brady]

commit 08596fde528d25045a6bf20bf6ab6e28a1da505e
Merge: a7928a2 cd0ddef
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Aug 29 18:10:57 2013 +0100

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

 openstack-cinder.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---