From: John Lee <john_lee@openmoko.org>
Date: Fri, 29 Feb 2008 10:18:28 +0000 (+0000)
Subject: merge of 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
X-Git-Tag: Release-2010-05/1~7106^2^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022ac4bfbd6d85f4accbd23f18138a10b2e9f0de;p=openembedded.git

Merge ... 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
     and 'e1563879f370dd02713e036ee932bb571cce4bc4'
---

022ac4bfbd6d85f4accbd23f18138a10b2e9f0de
diff --cc conf/distro/include/preferred-om-2008-versions.inc
index 3c0027d050,7b92333189..10af8675e8
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@@ -1,8 -1,6 +1,9 @@@
 +PREFERRED_VERSION_asterisk = "1.4.17"
  PREFERRED_VERSION_busybox = "1.9.1"
- PREFERRED_VERSION_dbus = "1.1.4"
+ PREFERRED_VERSION_dbus = "1.1.20"
+ PREFERRED_VERSION_dbus-glib = "0.74"
 +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_pulseaudio = "0.9.9"
diff --cc conf/distro/include/sane-srcrevs.inc
index 0cf1788c8c,28f9b3dc20..c524c71fb5
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -64,8 -64,8 +64,9 @@@ 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-netsurf ?= "3859"
  SRCREV_pn-networkmanager ?= "2887"
  SRCREV_pn-networkmanager-applet ?= "200"
  SRCREV_pn-oh-puzzles ?= "22"