tree 2eb2141eb77d43701e718b5b5ab1cbd07401015f
parent 1d44d6e7a3369fb7773ba50d02c3baa8955da382
author Andrew Donald Kennedy <grkvlt@apache.org> 1291651546 +0000
committer Andrew Donald Kennedy <grkvlt@apache.org> 1291651546 +0000

Attempt one at merge from r1021441:HEAD

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68