Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 12:05:13 +0000 (14:05 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 12:05:13 +0000 (14:05 +0200)

Trivial merge