update to include recent changes
update to include recent changes


git-svn-id: 3e55e3acaecd8341fcaae6bcce8bfe498f4ed298@72067 13f79535-47bb-0310-9956-ffa450edef68

apache/velocity-tools,apache/velocity-tools