svn merge failed on prop change; trying to commit to get clean tree
Authored by: jdh2358 2010-08-03
Parent: [r8617]
Child: [r8619]