0.12dev: ported r8153 and r8167 from 0.11-stable. r8161 has issues related to #G300, so it's not merged for now.
Authored by: cboos 2009-05-01
Parent: [r8169]
Child: [r8171]