DISPATCH-30 - Ported the fix to the 0.2 release branch.


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