From: John Lee <john_lee@openmoko.org>
Date: Fri, 7 Mar 2008 13:05:07 +0000 (+0000)
Subject: merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
X-Git-Tag: Release-2010-05/1~7106^2^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b098d35b319ed6c00f363cb0d4fd447d7fb8d57;p=openembedded.git

Merge ... '26501141207c84e31e0f43c5795a15c0f16dbce5'
     and '86618f966282489d43b51fbf0ee93b954ac615ae'
---

0b098d35b319ed6c00f363cb0d4fd447d7fb8d57
diff --cc conf/distro/include/sane-srcrevs.inc
index 39550c221e,d8b9ddb63b..b0c41bedbf
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -146,10 -148,10 +148,10 @@@ SRCREV_pn-settings-daemon ?= "1755
  SRCREV_pn-sjf2410-linux-native ?= "933"
  SRCREV_pn-sphyrna ?= "45"
  SRCREV_pn-tmut ?= "60"
 -SRCREV_pn-u-boot-openmoko ?= "4100"
 +SRCREV_pn-u-boot-openmoko ?= "4138"
  SRCREV_pn-usbpath ?= "3108"
  SRCREV_pn-usbpath-native ?= "3108"
- SRCREV_pn-webkit-gtk ?= "28656"
+ SRCREV_pn-webkit-gtk ?= "30762"
  SRCREV_pn-webkit-qt ?= "28656"
  SRCREV_pn-webkit-qtopia ?= "28656"
  SRCREV_pn-wesnoth ?= "22021"