#216 branch: merge changes from trunk [6843:6853]
Authored by: cboos 2008-04-21
Parent: [r6864]
Child: [r6866]