* merging changes from trunk phase one
Authored by: techtonik 2007-05-01
Parent: [r975]
Child: [r977]