Timeline link resolver branch: merge changes from trunk (integrates r4620:4622 and r4624:4641).
Authored by: cboos 2007-01-26
Parent: [r4642]
Child: [r4644]