* merging changes from trunk phase two
Authored by: techtonik 2007-05-01
Parent: [r976]
Child: [r978]