[openstack-puppet-modules/f21: 2/2] Merge branch 'f21' of ssh://pkgs.fedoraproject.org/openstack-puppet-modules into f21

[Ivan Chavero]

commit 7d44a59b31a7be2678ca6e253cfe1b311b3b09d8
Merge: c7ca4c1 a493182
Author: Ivan Chavero <ichavero at redhat.com>
Date:   Wed Sep 3 13:29:13 2014 -0600

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/openstack-puppet-modules into f21
    
    Conflicts:
    	openstack-puppet-modules.spec

---