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)
commitce04d0a5ab2368187fa4e74179de4c3361011988
tree20a18998f11b548f2a9eaec45ac544f63ac4fd16
parentad51c4ff74ebc0e5c58d7d96676f0b641e6a0799
parentbc87ed9e2cbfa1a5667ac583bdace946ffff9ae0
Merge branch 'bug_607_parental_control_fix' into experimental