Merge remote branch 'remotes/origin/bug_592_dont_allow_default_parental_control_pin'
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:32:46 +0000 (13:32 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:32:46 +0000 (13:32 +0200)

Trivial merge