Merge branch 'bug_617_default_favlist_handling_fix'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 22 Nov 2010 16:24:01 +0000 (17:24 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 22 Nov 2010 16:24:01 +0000 (17:24 +0100)

Trivial merge