Merging techniques branch with trunk :-D
Again, messy, hope nothing got broken in the process.
Authored by: klaussfreire 2008-06-16
Parent: [r12367]
Child: [r12369]