[mcollective-qpid-plugin/f18: 2/2] Merge branch 'master' into f18

[tdawson]

commit 73bb42364226060dc6dcef184ee92f577071aa71
Merge: 0a65bce 8d60297
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Dec 6 09:13:07 2012 -0600

    Merge branch 'master' into f18

 .gitignore                   |    1 +
 mcollective-qpid-plugin.spec |   55 +++++++++++++++++++++++++++++------------
 sources                      |    2 +-
 3 files changed, 41 insertions(+), 17 deletions(-)
---
diff --cc .gitignore
index 7d1c8fe,f87fa2e..04e7d44
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/mcollective-qpid-plugin-0.1.1.tar.gz
  /mcollective-qpid-plugin-1.0.1.tar.gz
+ /mcollective-qpid-plugin-1.1.1.tar.gz