tree 5616959458cf1c7c5512cd7b4996bfbe85612682
parent e459fa3246cf4e3e3eb65bf99b111021fd166621
author Andreas Veithen <veithen@apache.org> 1316938411 +0000
committer Andreas Veithen <veithen@apache.org> 1316938411 +0000

Merged r1175324 to the 1.6 branch.