#216 branch: sync with latest trunk [6867:6899/trunk] before merging back
Authored by: cboos 2008-04-28
Parent: [r6899]
Child: [r6901]