Reverted r7677. This was a false alarm!
The command used was: svn merge -r7677:7676 .
Authored by: bugman 2008-10-12
Parent: [r7680]
Child: [r7682]
