Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 11:50:43 +0000 (13:50 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 11:50:43 +0000 (13:50 +0200)
commit92f3d930521177990d62d8e384b57dbf9d5b75d7
tree559c63781bc031fd00db3ce08f1f75a892d3cf50
parentf755a8ae4676f32dd7f5bc043c9fecbc8c7070d4
parentce804e4009e25cdb1226c006c41b7edfaab56e06
Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental