From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 24 Nov 2010 23:12:59 +0000 (+0100)
Subject: Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=cdfd7a570b5b0813c8f62fc76deed949d7a11803

Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
---

cdfd7a570b5b0813c8f62fc76deed949d7a11803
diff --cc data/setup.xml
index f5dea73,fa8ff3f..c5eb07f
mode 100755,100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml