Mostly trivial fixes or comments or ports from trunk.
Authored by: watusimoto 2010-11-01
Parent: [r974]
Child: [r976]