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

[Pádraig Brady]

commit ad5992047f05ae0233bc6d2d62edda967c37e36b
Merge: 00086fe e9414bf
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu May 23 12:20:07 2013 +0100

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

 openstack-quantum.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---