From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 3 Nov 2010 16:40:44 +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=b3a9b32ac34417c49d149adb55a0ec6fc2a92b03

Merge branch 'bug_607_parental_control_fix'
---

b3a9b32ac34417c49d149adb55a0ec6fc2a92b03