merge of '0d25e98bdf0c1d029587a346db9cb19346e4c78c'

     and '24fd9b0c38a6b8e16bb8f4d92f03a041ab500e9d'

diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index 8ffad21..79fc56c 100644 (file)
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -206,4 +206,4 @@ SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
 SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
 SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
 SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070316"

diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index ffcbbc2..56bb4fb 100644 (file)
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"

diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index d6c43a3..10d0833 100644 (file)
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -221,7 +221,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
 
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
 
 
 SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"