Merge branch 'bug_617_default_favlist_handling_fix' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 22 Nov 2010 11:43:46 +0000 (12:43 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 22 Nov 2010 11:43:46 +0000 (12:43 +0100)

Trivial merge