[qpid-dispatch/el6: 4/4] Merge branch 'master' into el6

[Darryl L. Pierce]

commit e61071ec054c5a539b9d6b522a63b2c7b8f0168c
Merge: 770a405 ac01ee7
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Nov 19 13:45:03 2014 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	qpid-dispatch.spec

 ...-Remove-reference-to-qdstat.conf-in-qdsta.patch |   27 ++++++
 qpid-dispatch.spec                                 |   88 ++++++++++++--------
 2 files changed, 81 insertions(+), 34 deletions(-)
---