''category'' branch (#919): re-basing with current trunk
Authored by: cboos 2005-04-27
Parent: [r1562]
Child: [r1564]