merge of '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'

     and 'ec9b4188f1f043fd13783ea1ed8a13f349a862d8'

81 files changed, 716 insertions, 471 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0b039beeea..53c4380116 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,7 +94,7 @@ Person:     Junqian Gordon Xu 'xjqian'
 Mail:       xjqian@gmail.com
 Machines:   tosa, borzoi, nokia770
 Distros:    Ångström
-Recipes:    gnuplot
+Recipes:    gnuplot octave
 
 Person:     Justin Patrin
 Mail:       papercrane@reversefold.com
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index cc7b51f3a5..9d5d54bfb8 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -107,7 +107,18 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native util-linux-native"
+ASSUME_PROVIDED = "\
+    bc-native \
+    bzip2-native \
+    cvs-native \
+    diffstat-native \
+    patch-native \
+    perl-native-runtime \
+    python-native-runtime \
+    svn-native \
+    texinfo-native \
+    util-linux-native \
+    "
 
 ##################################################################
 # Package default variables.
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index f74f432730..e4b083dd86 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1123,7 +1123,7 @@ PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
 PREFERRED_VERSION_libxv ?= "1.0.3"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_lib10xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
 PREFERRED_VERSION_libyaml-perl ?= "0.62"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 11d7b14747..85c0d9d128 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -185,6 +185,8 @@ FEED_ARCH_lsppchd 	= "ppc603e"
 FEED_ARCH_lsppchg 	= "ppc603e"
 FEED_ARCH_storcenter 	= "ppc603e"
 FEED_ARCH_turbostation 	= "ppc603e"
+FEED_ARCH_mpc8313e-rdb 	= "ppce300c3"
+FEED_ARCH_mpc8323e-rdb 	= "ppce300c2"
 
 
 #strongarm machines, no EABI
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index aeb0a2afbc..0e29c19c5c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -35,6 +35,7 @@ SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7187c875be..ead766e3ee 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3424"
+SRCREV_pn-openmoko-messages2 ?= "3477"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "3149"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +105,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
 SRCREV_pn-openmoko-theme-standard2 ?= "3425"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3342"
+SRCREV_pn-openmoko-today2 ?= "3478"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
diff --git a/packages/busybox/busybox-1.2.0/angstrom/defconfig b/packages/busybox/busybox-1.2.0/angstrom/defconfig
index 981b7d7c71..e5f48ec64f 100644
--- a/packages/busybox/busybox-1.2.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.2.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.2.2/angstrom/defconfig b/packages/busybox/busybox-1.2.2/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.2.2/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.2/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.3.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.5.0/angstrom/defconfig b/packages/busybox/busybox-1.5.0/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.5.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.5.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.6.0/angstrom/defconfig b/packages/busybox/busybox-1.6.0/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.6.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.6.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/zaurus-updater/spitz/.mtn2git_empty b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zaurus-updater/spitz/.mtn2git_empty
+++ b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/angstrom/defconfig
index 19cfafab2c..30e71e8ffe 100644
--- a/packages/busybox/busybox-1.7.2/defconfig
+++ b/packages/busybox/busybox-1.7.2/angstrom/defconfig
@@ -677,8 +677,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-static-1.2.1/defconfig
+++ b/packages/busybox/busybox-static-1.2.1/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb
index f3bff07530..519468039a 100644
--- a/packages/busybox/busybox-static_1.2.1.bb
+++ b/packages/busybox/busybox-static_1.2.1.bb
@@ -1,5 +1,5 @@
 require busybox_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/busybox-1.2.1"
 
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 073a561e22..ca2db7e760 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r37"
+PR = "r38"
 
 SRC_URI += "file://add-getkey-applet.patch;patch=1 \
            file://below.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 22e7e064a5..39a052bc90 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI += "file://add-getkey-applet.patch;patch=1 \
            file://below.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb
index db8dd68c01..009d1724ff 100644
--- a/packages/busybox/busybox_1.2.0.bb
+++ b/packages/busybox/busybox_1.2.0.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://defconfig"
 
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 054649e9df..64a6000747 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 59aa5f07fc..75847e1117 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,5 +1,7 @@
 require busybox.inc
 
+PR = "r1"