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

[tdawson]

commit fd50b23c053b5d53af10721f16473b0d51a7e1f1
Merge: 716d17d aeefdd7
Author: Troy Dawson <tdawson at redhat.com>
Date:   Fri Feb 15 17:03:41 2013 -0600

    Merge branch 'master' into f18

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