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

[Pádraig Brady]

commit d9530c9e7a38276f32e0babe4494665028c384fc
Merge: cade58e 141414e
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Mar 7 10:14:11 2012 +0000

    Merge branch 'master' into f17

 openstack-nova-db-setup |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---