#216 branch: merge changes from trunk [6793:6843]
Authored by: cboos 2008-04-17
Parent: [r6845]
Child: [r6847]