Merge branch 'bug_607_parental_control_fix' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:54 +0000 (17:40 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:54 +0000 (17:40 +0100)
commit1f65ad77eb4ec34015b873d5327a6f91dadbdb70
treeab817f37f65e7766aea1c8f4b9b7a2bee0e24a1f
parent00d4f213c39e0ddffa2d0353af8cf65e77f8f709
parent1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7
Merge branch 'bug_607_parental_control_fix' into experimental