context-refactoring: merging [6135], [6136] and [6137] from trunk
Authored by: cboos 2007-11-09
Parent: [r6137]
Child: [r6139]