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

[tdawson]

commit 6bf685d5678fde2ab9f1e3cf0dad43c4afa7d8b7
Merge: eb1718d b8593fe
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Dec 6 09:40:53 2012 -0600

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...em-openshift-origin-msg-broker-mcollective.spec |  215 ++++++++------------
 sources                                            |    2 +-
 3 files changed, 84 insertions(+), 134 deletions(-)
---
diff --cc .gitignore
index 46c2a4d,d848017..1696e56
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/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