tree 19b5380ec0642163ec3446d57ebd6486f82b88a8
parent 75df43c1e9e74488fc457740f6d566fe871cbb54
author Emmanuel Lecharny <elecharny@apache.org> 1288406279 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1288406279 +0000

Merged the trunk modifications into the branch

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