Fix bug introduced in 6755 and modified in 6756--problem using svnmerge?
Authored by: efiring 2009-01-07
Parent: [r6756]
Child: [r6758]