Further code cleanup around shutdown function Fix unload problem with icons not being removed properly
Further code cleanup around shutdown function
Fix unload problem with icons not being removed properly


git-svn-id: 2ed50fc0108f1b16e9c2f42a291709b571f28493@623 741c516a-3ba6-4fa8-b112-5c51f26a88df

tbentropy/sixornot,tbentropy/sixornot,tbentropy/sixornot