Merged back the trunk into my branch

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-AP@1059098 13f79535-47bb-0310-9956-ffa450edef68
5 files changed