[openstack-nova/el6: 5/5] Merge branch 'master' into el6

[Pádraig Brady]

commit 87d9e210d1aae5247bc651892860c4da19049604
Merge: 909fd19 b8158c6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jan 26 12:41:03 2012 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	update-patches.sh

 ...fix-X-Server-Management-Url-for-v1.0-noau.patch |    3 ---
 ...hain-rule-for-EC2-metadata-requests-lp-85.patch |    3 ---
 ...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch |    3 ---
 ...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch |    3 ---
 ...e-VolumeDriver.sync_exec-method-lp-819997.patch |    3 ---
 ...tadm-tgtadm-calls-out-into-helper-classes.patch |    3 ---
 ...tgtadm-off-by-one-error.-Fixes-bug-871278.patch |    3 ---
 ...57-abstract-out-disk-image-access-methods.patch |    3 ---
 ...7-support-handling-images-with-libguestfs.patch |    3 ---
 ...estfs-operation-with-specified-partitions.patch |    3 ---
 ...e-don-t-access-the-net-when-building-docs.patch |    3 ---
 11 files changed, 0 insertions(+), 33 deletions(-)
---