Merge branch 'bug_607_parental_control_fix' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 30 Oct 2010 14:24:44 +0000 (16:24 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 30 Oct 2010 14:24:44 +0000 (16:24 +0200)

Trivial merge