tree 677708e535747b4dd3b9e962fa09a5e1dfeacd9a
parent febefc5d119a8a31fa9e858e7904333c918eb377
parent 8a17d00e513bf4a49d9472af064d5f0dc36d4bd6
author Andreas Veithen <veithen@apache.org> 1313608519 +0000
committer Andreas Veithen <veithen@apache.org> 1313608519 +0000

Reintegrated changes from trunk.