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

[Pádraig Brady]

commit 3aab086fc06a26b1d65c11bd10cd6e986cd4435a
Merge: d9530c9 11ec99f
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Mar 8 16:23:09 2012 +0000

    Merge branch 'master' into f17

 ...sync_power_states-to-obtain-correct-state.patch |   31 ++++++++++++++++++++
 openstack-nova.spec                                |    7 ++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---