tree d52c0a8492d94059aed457127a43e061ed949d4c
parent 8b7d597faf87f01746948637c242c2134631d28f
author Kenneth Anthony Giusti <kgiusti@apache.org> 1369410952 +0000
committer Kenneth Anthony Giusti <kgiusti@apache.org> 1369410952 +0000

QPID-4883: merge fix from trunk

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