context manager: r6064 was a bit overzealous, and was fixed partially in r6065 and now completely with this change.
Authored by: cboos 2007-10-18
Parent: [r6065]
Child: [r6067]