Initializing merge tracking on the property renderer and timeline link resolver branches
Authored by: cboos 2007-01-23
Parent: [r4612]
Child: [r4614]