context refactoring: merge with trunk (r6060, r6072 and r6073)
Authored by: cboos 2007-10-22
Parent: [r6073]
Child: [r6075]