[openstack-nova/f17: 8/9] Merge commit '8d4333a^' into f17

[Pádraig Brady]

commit f2942e4f49e6d17e55936fa77666d10d1b3b1de1
Merge: 7556c6c f1a9fc0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue May 29 22:05:12 2012 +0100

    Merge commit '8d4333a^' into f17

 openstack-nova.spec |   33 +++++++++------------------------
 update-patches.sh   |    8 +++++---
 update-patches.txt  |   41 ++++++++++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 44 deletions(-)
---