Merge branch 'bug_607_parental_control_fix'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:44 +0000 (17:40 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:44 +0000 (17:40 +0100)

Trivial merge