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

Trivial merge