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

[Pádraig Brady]

commit e7abb5efb0e4c2485fee9c9e94bfc68eb93c7357
Merge: 6ef6eb7 e375fbf
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sun Dec 4 04:11:02 2011 +0000

    Merge branch 'master' into el6

 ...57-abstract-out-disk-image-access-methods.patch |   55 +++++++++++++------
 ...7-support-handling-images-with-libguestfs.patch |    8 ++--
 2 files changed, 41 insertions(+), 22 deletions(-)
---