From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 21 Mar 2008 02:08:36 +0000 (+0000)
Subject: merge of '5835e96816cbf14d4a7298959b92309cd3d8178b'
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00452481d1147812cfc25b6ab34c79f3d688b340;p=openembedded.git

Merge ... '5835e96816cbf14d4a7298959b92309cd3d8178b'
     and 'f7df80732af56b59315ef203e69f092313ec2ddd'
---

00452481d1147812cfc25b6ab34c79f3d688b340
diff --cc conf/distro/include/sane-srcrevs.inc
index e871e92473,21c1d3cf14..60d35f2bdb
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -137,12 -137,11 +137,12 @@@ SRCREV_pn-openmoko-toolchain-scripts ?
  SRCREV_pn-openmoko-worldclock2 ?= "3365"
  SRCREV_pn-openocd ?= "517"
  SRCREV_pn-openocd-native ?= "517"
- SRCREV_pn-opkg ?= "4210"
- SRCREV_pn-opkg-native ?= "4210"
- SRCREV_pn-opkg-sdk ?= "4209"
+ SRCREV_pn-opkg ?= "4235"
+ SRCREV_pn-opkg-native ?= "4235"
+ SRCREV_pn-opkg-sdk ?= "4235"
  SRCREV_pn-oprofileui ?= "160"
  SRCREV_pn-psplash ?= "249"
 +SRCREV_pn-pty-forward-native ?= "4214"
  SRCREV_pn-pylgrim ?= "20"
  SRCREV_pn-pyneod ?= "88"
  SRCREV_pn-pyneog ?= "88"