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

[Xavier Queralt Mateu]

commit f9a5a18534a3b448b005809df26ec58fca892086
Merge: 8348dc0 c4aa92a
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Thu Oct 17 19:25:15 2013 +0200

    Merge branch 'master' into f20

 .gitignore          |    1 +
 openstack-nova.spec |   11 +++++++----
 sources             |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---