tree 5ee3a7bfad2feb6dbb0c34da4427ff9a9764d861
parent e15dda9c4a135c0d10e2814ba2f74da122f3bc21
author Emmanuel Lecharny <elecharny@apache.org> 1282308793 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1282308793 +0000

Merged trunk into the codec branch

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