Merge updates/bugfixes made in the orcallator tree - this fixes #1691156
Authored by: akiernan 2007-06-13
Parent: [r32]
Child: [r34]