InterTrac: merged changes log:trunk@...:2438, i.e. upto milestone:0.9
Authored by: cboos 2005-11-05
Parent: [r2495]
Child: [r2497]