Merge M2.1 and trunk
--------------------
Key: QPID-832
URL: https://issues.apache.org/jira/browse/QPID-832
Project: Qpid
Issue Type: Task
Affects Versions: M2.1, M3
Reporter: Aidan Skinner
Fix For: M3M2.1 and trunk should be merged -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
