tree a1cc698953a243767c6d8f147bb37ed074f21441
parent d9a848b855c7c57e47a4eed8fce238c5073dafb2
author Emmanuel Lecharny <elecharny@apache.org> 1279784146 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1279784146 +0000

Merged changes done in trunk into the branch

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