tree 925d5f16e1670784d51332cde95f25ce0ae4b82f
parent ced63cd44a1b4ca552ce15c309ba6789415c4733
parent bff6c2d417736f131e0b3bb2b032fdff687e1540
author Tom Watson <tjwatson@apache.org> 1433864004 +0000
committer Tom Watson <tjwatson@apache.org> 1433864004 +0000

Merged latest trunk into subsystemsR6

git-svn-id: https://svn.apache.org/repos/asf/aries/branches/subsystemsR6@1684451 13f79535-47bb-0310-9956-ffa450edef68