0.12dev: merge of 0.11-stable (corresponds to [T7608-7610,7615,7617-7620])
Authored by: cboos 2008-10-29
Parent: [r7623]
Child: [r7625]