INCOMPLETE COMMIT
Required commit before doing possibly nasty stuff to my local source tree. This will most likely break the build, but it shouldn't be a problem in this branch.
Authored by: klaussfreire 2009-08-17
Parent: [r12556]
Child: [r12558]