From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 17 Mar 2011 17:49:00 +0000 (+0100)
Subject: Merge branch 'bug_453_multiepg_no_more_ask_bouquet' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=31ac4a233ddcb341e49f63f964d4d35fd2097a9c

Merge branch 'bug_453_multiepg_no_more_ask_bouquet' into experimental
---

31ac4a233ddcb341e49f63f964d4d35fd2097a9c
diff --cc data/setup.xml
index c5eb07f,93549fa..20231a0
mode 100755,100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml