#216 branch: it seems that r6791 was missing from previous merges, integrating it now.
Authored by: cboos 2008-04-21
Parent: [r6865]
Child: [r6867]