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

[tdawson]

commit c44ebe6a6356797e4c8f7bf7cf577f342ebd63cb
Merge: e8137b4 920d41a
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Feb 18 16:55:57 2013 -0600

    Merge branch 'master' into f18

 .gitignore                   |    1 +
 mcollective-qpid-plugin.spec |   38 +++++++++++++++++++++-----------------
 sources                      |    2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)
---