Merge branch 'bug_533_fix_crash_on_satconfig_close'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:02 +0000 (12:02 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:02 +0000 (12:02 +0200)

Trivial merge