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

[Pádraig Brady]

commit 7946f692a9bc6d74ec62ae86acba2837db4d4578
Merge: ec32ff0 85b1474
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Apr 27 13:16:01 2012 +0100

    Merge branch 'master' into f17

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