Merge branch 'bug_607_parental_control_fix'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 19:57:09 +0000 (20:57 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 19:57:09 +0000 (20:57 +0100)

Trivial merge