master code cleanup patch contrib. by lz; sysinfo display bug fix
Authored by: lilyco 2010-10-10
Parent: [r536]
Child: [r538]