tree f3ef508a96fd311ec0c202132d162b58dc979002
parent 7e3d2bc45c05932e6a8d9a0d296dbb24ab76d924
author Alex Karasulu <akarasulu@apache.org> 1298242416 +0000
committer Alex Karasulu <akarasulu@apache.org> 1298242416 +0000

merging in from trunk before swapping out trunk

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