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

[Pádraig Brady]

commit 5f86913f4bfbee91dea4a406dcb8639165f7b322
Merge: 44ae183 6523672
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Dec 30 12:32:10 2011 +0000

    Merge branch 'master' into el6

 openstack-nova.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---