tree 66976f9384ae60ef4e8c9d48e3099cb6bb778b76
parent 0ef0563e9aecb5a023a6a4b9ada411dc9afac562
parent 0b1c641b86f51fa73a00318f66e62428fec0fcc8
author Alex Karasulu <akarasulu@apache.org> 1299602340 +0000
committer Alex Karasulu <akarasulu@apache.org> 1299602340 +0000

merging in to milestones from trunk

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