DISPATCH-29 - Ported fix to 0.2 release branch


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