InterTrac: merged changes from log:trunk@...:2830
Authored by: cboos 2006-01-25
Parent: [r2830]
Child: [r2832]