merge of '8dccbf106093aaa7b62b2a96962945185534c923'

     and 'c50825ba187c292f591cf43c91216cebffb5e290'

diff --cc conf/checksums.ini
Simple merge

diff --cc conf/distro/include/preferred-om-2008-versions.inc
index d7209be,9d002f6..b801536
--- 1/conf/distro/include/preferred-om-2008-versions.inc
--- 2/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@@ -1,7 -1,8 +1,13 @@@
- PREFERRED_VERSION_vte = "0.16.10"
- PREFERRED_VERSION_dbus = "1.1.1"
- PREFERRED_VERSION_gpsdrive = "2.10pre4"
 -PREFERRED_VERSION_dbus = "1.1.4"
 +PREFERRED_VERSION_asterisk = "1.4.17"
+ PREFERRED_VERSION_busybox = "1.9.1"
++PREFERRED_VERSION_dbus = "1.1.4"
 +PREFERRED_VERSION_gnash = "0.8.1"
++PREFERRED_VERSION_gpsdrive = "2.10pre4"
+ PREFERRED_VERSION_gst-pulse = "0.9.7"
+ PREFERRED_VERSION_libtool = "1.5.24"
 +PREFERRED_VERSION_mono = "1.2.6"
 +PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6"
++PREFERRED_VERSION_mono-native = "1.2.6"
+ PREFERRED_VERSION_pulseaudio = "0.9.9"
+ PREFERRED_VERSION_udev = "118"
+ PREFERRED_VERSION_vte = "0.16.10"
 -

diff --cc conf/distro/include/sane-srcrevs.inc
index 46c9097,2ff0809..0cf1788
--- 1/conf/distro/include/sane-srcrevs.inc
--- 2/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -55,8 -63,10 +63,11 @@@ SRCREV_pn-matchbox-keyboard-inputmetho
  SRCREV_pn-matchbox-panel-2 ?= "1626"
  SRCREV_pn-moko-gtk-engine ?= "3405"
  SRCREV_pn-mpd-alsa ?= "6952"
+ SRCREV_pn-mplayer ?= "24587"
 +SRCREV_pn-multitap-pad ?= "337"
  SRCREV_pn-neod ?= "3421"
+ SRCREV_pn-networkmanager ?= "2887"
+ SRCREV_pn-networkmanager-applet ?= "200"
  SRCREV_pn-oh-puzzles ?= "22"
  SRCREV_pn-osb-browser ?= "125"
  SRCREV_pn-osb-jscore ?= "117"

diff --cc conf/distro/openmoko.conf
Simple merge

diff --cc packages/asterisk/asterisk_1.4.17.bb
Simple merge

diff --cc packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Simple merge