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

[Pádraig Brady]

commit a1176362a68a20fe316e5c75441ef1828bf7862f
Merge: e4573f1 09bb944
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Mar 20 13:31:36 2012 +0000

    Merge branch 'master' into f17

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    4 +-
 ...-interface-drivers-for-the-Linux-Bridge-p.patch |  195 -----------
 ...0002-fix-useexisting-deprecation-warnings.patch |    2 +-
 0003-Adds-soft-reboot-support-to-libvirt.patch     |  171 ----------
 ...tomic-manipulation-of-libvirt-disk-images.patch |   26 +-
 ...-new-style-config-to-be-used-for-flagfile.patch |   58 ----
 ...sync_power_states-to-obtain-correct-state.patch |   31 --
 0006-nonblocking-libvirt-mode-using-tpool.patch    |   80 -----
 ...-representation-of-ext_srv_attr-extension.patch |  349 --------------------
 ...Fix-backing-file-cp-resize-race-condition.patch |   67 ----
 ...ompute-service-to-start-with-missing-libv.patch |   77 -----
 openstack-nova.spec                                |   29 +--
 sources                                            |    2 +-
 14 files changed, 26 insertions(+), 1066 deletions(-)
---