tree c8d9e519375c14183289eed69ad9822e52fc24a3
parent 99b48fec909be239a4d37fc9eeb88ea62bb73fd4
author Emmanuel Lecharny <elecharny@apache.org> 1288444475 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1288444475 +0000

Merge back to trunk the config branch

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