Merging techniques branch into trunk :-D
Was a bit messy, I hope I didn't break anything
Authored by: klaussfreire 2008-06-16
Parent: [r12366]
Child: [r12368]