updated and added license where needed
Authored by: matzon 2008-04-07
Parent: [r2985]
Child: [r2987]
