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

[Pádraig Brady]

commit 46e817be30a0560bffd5b22d3ae6a8f5296617dc
Merge: c1557f7 d9b6718
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Apr 2 01:28:41 2012 +0100

    Merge branch 'master' into f17

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