tree 7422cd3ea014316b4c62848b6d665b151a2b4c71
parent a0d769ca80ce3f183355aaa7980948bf510488a0
parent 1a448911da90c46feaf4ce6cc0265ec34855c002
author Jeremy Hughes <hughesj@apache.org> 1320773254 +0000
committer Jeremy Hughes <hughesj@apache.org> 1320773254 +0000

Merging trunk into the branch from r1189798-1199347 in preparation to reintegration


git-svn-id: https://svn.apache.org/repos/asf/aries/branches/oct-2011-release@1199354 13f79535-47bb-0310-9956-ffa450edef68