tree 893b637418e5ef26dee86e0a3083385e58e04975
parent 2617882a73d9f0fe2d21bb3926feff33c490c7df
author Kenneth Anthony Giusti <kgiusti@apache.org> 1312815403 +0000
committer Kenneth Anthony Giusti <kgiusti@apache.org> 1312815403 +0000

QPID-3394: merge fix from trunk

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