0.12dev: merge of 0.11-stable (corresponds to [7622-7623,7625])
Authored by: cboos 2008-10-29
Parent: [r7625]
Child: [r7627]