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

[Pádraig Brady]

commit 6b2ca1a51d7f05a982e4e3390d4c84d471973d60
Merge: a117636 b8ce22b
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Mar 20 16:03:22 2012 +0000

    Merge branch 'master' into f17

 openstack-nova.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---