tree e8d26c0981a666442ad4aa2fff5ddb87c5ce5866
parent 8d32b03448e8e1ba6319fc0ac484d0ab54b29b38
author Stephen D. Huston <shuston@apache.org> 1240520795 +0000
committer Stephen D. Huston <shuston@apache.org> 1240520795 +0000

Merge in trunk changes from r758432:768028

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