#216 branch was merged in trunk r6901 for [milestone:0.11]
Authored by: cboos 2008-07-04
Parent: [r7320]
Child: [r7322]