merge of e25895d0b5e8a86707eba051a810b2bd0c1c113d

     and cadef8594f2fb67d345f718259a6331febdaa3bd

diff --cc packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
index 4590f81,3d65744..4663d03
--- 1/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
--- 2/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
@@@ -2,4 -2,6 +2,5 @@@ include ${PN}.in
  
  SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \
             ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
 +           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+          ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"