Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'

diff --cc data/skin_default/Makefile.am
Simple merge

diff --cc data/skin_default/icons/Makefile.am
index c6cb269ee0adce24a8f64421ce08ea90592e3f16,38e32376bd7b24a39fa69c046a32d1e4da607be2..b453aa7709ebc72b583fd2f7e423253a27fa456b
mode 100755,100644..100755
--- 1/data/skin_default/icons/Makefile.am
--- 2/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@@ -40,14 -32,9 +40,15 @@@ dist_install_DATA = 
        lock_off.png \
        lock_on.png \
        lock.png \
+       lockBouquet.png \
        marker.png \
        mp_buttons.png \
 +      network_wired.png \
 +      network_wired-active.png \
 +      network_wired-inactive.png \    
 +      network_wireless.png \
 +      network_wireless-active.png \
 +      network_wireless-inactive.png \ 
        plugin.png \
        rass_logo.png \
        rass_page1.png \
@@@ -61,5 -48,6 +62,7 @@@
        scan-c.png \
        scan-s.png \
        scan-t.png \
-       selectioncross.png
+       selectioncross.png \
+       unlock.png \
+       unlockBouquet.png
 +