From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 31 Oct 2005 21:06:30 +0000 (+0000)
Subject: merge of e25895d0b5e8a86707eba051a810b2bd0c1c113d
X-Git-Tag: Release-2010-05/1~9453^2~3161^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=524d161ee5693f02ae94aa9c91803cde005434b8;p=openembedded.git

merge of e25895d0b5e8a86707eba051a810b2bd0c1c113d
     and cadef8594f2fb67d345f718259a6331febdaa3bd
---

524d161ee5693f02ae94aa9c91803cde005434b8
diff --cc packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
index 4590f81108,3d65744112..4663d0350e
--- a/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"