From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 2 Nov 2010 19:57:09 +0000 (+0100)
Subject: Merge branch 'bug_607_parental_control_fix'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=57cb95e528dd810e03c6b16fbb462ed3b82f1207

Merge branch 'bug_607_parental_control_fix'
---

57cb95e528dd810e03c6b16fbb462ed3b82f1207