[openstack-nova/f20: 4/4] Merge branch 'master' into f20

[Xavier Queralt Mateu]

commit 7a52de716074b6273e0b7557b3acfd8dba8afbd3
Merge: 42d2155 ef068d1
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Fri Nov 29 08:59:37 2013 +0100

    Merge branch 'master' into f20

 ...ass-volume_api-to-get_encryption_metadata.patch |  113 +++++
 0005-ensure-we-don-t-boot-oversized-images.patch   |  451 ++++++++++++++++++++
 openstack-nova.spec                                |   12 +-
 3 files changed, 575 insertions(+), 1 deletions(-)
---