tree 51da8e3577c94873ebf19d94c0cc95f447569e94
parent 5deaca879f13eeb55fbdf0ca39e232e41294d38e
author Alan Conway <aconway@apache.org> 1315345663 +0000
committer Alan Conway <aconway@apache.org> 1315345663 +0000

QPID-2920: Rebased on trunk, fix up minor conflicts.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-1@1165889 13f79535-47bb-0310-9956-ffa450edef68