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

[Pádraig Brady]

commit 0dced8a2aee63a9c3a9db716a7fcf2974c91e2e9
Merge: 478caff ebbc374
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jan 23 22:10:44 2012 +0000

    Merge branch 'master' into el6

 openstack-nova.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---