tree 505ff1ceb3454dab031cf3c29da54884d8636814
parent 58148b4bc8caec269ec47c4b26f54587fa8a1532
author Alex Karasulu <akarasulu@apache.org> 1299543346 +0000
committer Alex Karasulu <akarasulu@apache.org> 1299543346 +0000

merging in from trunks

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/milestones@1079045 13f79535-47bb-0310-9956-ffa450edef68