TracDiff: merged in changes from trunk, upto 0.9b2 (log:trunk#2283:2300)
Authored by: cboos 2005-09-27
Parent: [r2302]
Child: [r2304]