From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 16 Jun 2008 11:12:58 +0000 (+0000)
Subject: merge of '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
X-Git-Tag: Release-2010-05/1~6680^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc22b05108d2c2f7e173b1c30a8189c7b10b07db;p=openembedded.git

Merge ... '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
     and '3b2129cbd868ae2da323fb4418c0120038a9d33f'
---

dc22b05108d2c2f7e173b1c30a8189c7b10b07db
diff --cc conf/distro/include/sane-srcrevs.inc
index 0cd23c21bd,bdef93a9c5..e3d50fc52c
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -156,10 -156,10 +156,10 @@@ SRCREV_pn-openmoko-worldclock2 ?= "3365
  SRCREV_pn-openocd ?= "517"
  SRCREV_pn-openocd-native ?= "517"
  SRCREV_pn-opkg ?= "4488"
- SRCREV_pn-opkg-native ?= "4452"
+ SRCREV_pn-opkg-native ?= "4488"
  SRCREV_pn-opkg-sdk ?= "4488"
  SRCREV_pn-oprofileui ?= "160"
 -SRCREV_pn-packagekit ?= "ebbbfa191257861bd19bd47ba646dce590b51858"
 +SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
  SRCREV_pn-psplash ?= "249"
  SRCREV_pn-pty-forward-native ?= "4214"
  SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"