propagate from branch 'org.openembedded.dev' (head d4815037189353e6445b917ec6b4bd64777c3c0d)

            to branch 'org.openembedded.dev.avr32' (head ba98da9ed913fe826c336573fe5912b1168f3e28)

100 files changed, 4164 insertions, 512 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9e2b73cc5e..27b9e87e92 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11914,3 +11914,7 @@ sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
 md5=e34320c97d768191217424af64de380a
 sha256=f8e9efccbccbe1326a0a2579eb86651cf65e0937a38fae1afaec2269208d24a1
 
+[http://downloads.sourceforge.net/navit/navit-0.0.1.tar.gz]
+md5=521fbc102a804f7c26d4240b3f970380
+sha256=d79151209bf6b2d470773968b62258c56313bf857cda8ef27f8e321dd1a9d084
+
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index 14d6336b96..ae1ec5fb9c 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -78,5 +78,6 @@ SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
 SRCREV_pn-sphyrna ?= "${AUTOREV}"
 SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
 SRCREV_pn-xoo ?= "${AUTOREV}"
+SRCREV_pn-mplayer ?= "${AUTOREV}"
 
 SRCREV ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 020a8ebf86..c4d478ccde 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -6,6 +6,8 @@ SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
+SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
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 1f39916f4f..ffcbbc2217 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -176,7 +176,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}+cvs20070922"
 PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index 0ff684ed68..19ee48174d 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -277,6 +277,6 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4.0"
-PREFERRED_VERSION_xserver-xorg ?= "1.4.0"
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ba5040ba07..3330ecff4d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -8,9 +8,9 @@
 SRCREV_pn-bfin-uclibc ?= "1806"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
-SRCREV_pn-eglibc ?= "3468"
-SRCREV_pn-eglibc-initial ?= "3468"
-SRCREV_pn-eglibc-intermediate ?= "3468"
+SRCREV_pn-eglibc ?= "3531"
+SRCREV_pn-eglibc-initial ?= "3531"
+SRCREV_pn-eglibc-intermediate ?= "3531"
 SRCREV_pn-ezxd ?= "2058"
 SRCREV_pn-elf2flt="1786"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
@@ -22,7 +22,7 @@ SRCREV_pn-libgsmd ?= "2957"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "2868"
+SRCREV_pn-libmokoui2 ?= "3032"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -33,10 +33,15 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_moko-gtk-engine ?= "3029"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-browser2 ?= "3007"
+SRCREV_pn-openmoko-browser2 ?= "3031"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "2789"
 SRCREV_pn-openmoko-common ?= "397"
@@ -91,3 +96,5 @@ SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
 SRCREV_pn-webkit-gtk ?= "25615"
 SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-mplayer ?= "24587"
+
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index d490028eca..ead6a83282 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -5,7 +5,7 @@
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
+PACKAGE_EXTRA_ARCHS = "ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 UBOOT_ENTRYPOINT = "0"
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 42fc6c7d6e..09f61d0534 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -13,10 +13,10 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,
 
 FILES_${PN} += " \
 		${datadir}/icons/* \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+		${datadir}/abiword-${SHRT_VER}/glade \
+		${datadir}/abiword-${SHRT_VER}/scripts \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
 #		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 5fcc1dd1a2..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
index 66d8fae0ad..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1