context-refactoring: merging changes from [6115:6128/trunk]
Authored by: cboos 2007-11-06
Parent: [r6133]
Child: [r6135]