InterTrac: merged changes log:trunk@...:2427
Authored by: cboos 2005-10-31
Parent: [r2427]
Child: [r2429]