Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:59:31 +0000 (11:59 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:59:31 +0000 (11:59 +0200)
commit0c8665143633b5f854db9b72102f3c87a16f1722
tree86099d7d5ca3804de0143885c3f40d7769af4b5e
parent37152843c915fd0a9352256d804ced4ff54c23c4
parent599e3172d1d04be8513fdf2e706d9ec3faedd054
Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
data/skin_default/Makefile.am
data/skin_default/icons/Makefile.am