tree 677c1f03db762575efd56e2d41df9a0649739d61
parent ff2c05ba49566567122646e7035e51741b2b1620
author Richard S. Hall <rickhall@apache.org> 1298236248 +0000
committer Richard S. Hall <rickhall@apache.org> 1298236248 +0000

Update trunk from branch.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1072730 13f79535-47bb-0310-9956-ffa450edef68