[rubygem-openshift-origin-msg-broker-mcollective/f18: 4/4] Merge branch 'master' into f18

[tdawson]

commit 42ad2640a4d42e80e5e3074f93f935ced9a92064
Merge: fd50b23 246bf78
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Mar 12 13:34:04 2013 -0500

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...em-openshift-origin-msg-broker-mcollective.spec |  120 +++++++++++++++-----
 sources                                            |    2 +-
 3 files changed, 91 insertions(+), 32 deletions(-)
---