timeline-refactoring: merge changes from trunk [6143:6153]
Authored by: cboos 2007-11-13
Parent: [r6154]
Child: [r6156]