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

[tdawson]

commit e8137b4846769e6baf68bd044b554154de118de3
Merge: 2766f3f 544a653
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 08:45:53 2013 -0600

    Merge branch 'master' into f18

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