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

[tdawson]

commit 716d17dc2c7e051d4e2fc6c9586e196287e5027c
Merge: 456d7c1 de6540a
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 09:57:24 2013 -0600

    Merge branch 'master' into f18

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