Reverted r9194, the temporary commenting out of a data type.
The command used was: svn merge -r9194:9193 .
Authored by: bugman 2009-07-12
Parent: [r9195]
Child: [r9197]