context-refactoring: merge with trunk till r6079 and remove a spurious change in timeline/web_ui.py.
Authored by: cboos 2007-10-22
Parent: [r6079]
Child: [r6081]