cleanup, tweaks for better compatibility with Appupdater
Authored by: nabber00 2009-11-22
Parent: [r456]
Child: [r458]