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

[tdawson]

commit 456d7c1c3f1598adc335c970ac79c16135f34979
Merge: 6bf685d ca11f17
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Jan 15 16:40:38 2013 -0600

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...em-openshift-origin-msg-broker-mcollective.spec |   54 ++++++++++++++++---
 sources                                            |    2 +-
 3 files changed, 47 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 1696e56,9415f37..9f02fe3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -/openshift-origin-msg-broker-mcollective-0.1.1.gem
  /openshift-origin-msg-broker-mcollective-1.0.1.gem
  /openshift-origin-msg-broker-mcollective-1.1.6.gem
+ /openshift-origin-msg-broker-mcollective-1.2.7.gem