[openstack-nova/f17: 3/3] Merge branch 'master' into f17

[Pádraig Brady]

commit 50beec3448f750ca3c8ccd1871bf10246bb06ee9
Merge: 7946f69 f064200
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed May 9 16:29:11 2012 +0100

    Merge branch 'master' into f17

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