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)
commitb3a9b32ac34417c49d149adb55a0ec6fc2a92b03
treef36aa08d965e5698d973971f1c3ee9e8cc80f6f7
parent57cb95e528dd810e03c6b16fbb462ed3b82f1207
parent1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7
Merge branch 'bug_607_parental_control_fix'