o merged changes done in trunk after branching


git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/server-config-indexbean-experiment@1029978 13f79535-47bb-0310-9956-ffa450edef68
4 files changed
tree: d6c37fbfe5078f627a71cf7db8bd5e378d842232
  1. src/
  2. pom.xml