[openstack-cinder/f19: 2/2] Merge branch 'master' into f19

[Eric Harney]

commit cf8875f0165e593ea0c012246057b4fed67fa466
Merge: 15f7017 2f21339
Author: Eric Harney <eharney at redhat.com>
Date:   Fri Apr 5 15:19:18 2013 -0400

    Merge branch 'master' into f19

 .gitignore            |    4 +---
 openstack-cinder.spec |   11 +++++++----
 sources               |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---