Merged the [source:sandbox/context-refactoring@... context-refactoring] branch into trunk.
Authored by: cboos 2007-11-09
Parent: [r6138]
Child: [r6140]