adding GPL-Header and other minor code cleanup
Authored by: mrieser 2010-05-03
Parent: [r11368]
Child: [r11370]