Timeline link resolver branch: merged with latest trunk [4537:4613/trunk]
Authored by: cboos 2007-01-23
Parent: [r4614]
Child: [r4616]