context-refactoring: merging changes from [6079:6113/trunk]
Authored by: cboos 2007-10-29
Parent: [r6113]
Child: [r6115]