tree 19b5380ec0642163ec3446d57ebd6486f82b88a8
parent d4982eb7331727a82d7bae20ea146efa8eb69c96
author Emmanuel Lecharny <elecharny@apache.org> 1288406339 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1288406339 +0000

Merged the trunk modifications into the branch

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