Merge branch 'bug_617_default_favlist_handling_fix'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 21:09:09 +0000 (22:09 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 21:09:09 +0000 (22:09 +0100)

Trivial merge