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)
commit57cb95e528dd810e03c6b16fbb462ed3b82f1207
tree4e76e982570da7fd7ca819a9f51b496772352c9c
parenta83125b3e0f7fcfcb06f19e2d1eb086ba792d227
parent3c14624fb6631feb91ac28c102027fb9bbc79b7a
Merge branch 'bug_607_parental_control_fix'