From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 6 Mar 2007 17:48:07 +0000 (+0000)
Subject: merge of '90546772890b2522b88f319019775be22b6e70f2'
X-Git-Tag: Release-2010-05/1~9088^2^2^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccab4b3ba6f2ccc5e598c9d2ec6405f4494ca200;p=openembedded.git

Merge ... '90546772890b2522b88f319019775be22b6e70f2'
     and '9ddb942debcda58f976549da4141ba8488765949'
---

ccab4b3ba6f2ccc5e598c9d2ec6405f4494ca200
diff --cc conf/distro/angstrom-2007.1.conf
index 187d7c6bf1,e868ed581d..d6766bedbc
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@@ -85,11 -85,9 +85,11 @@@ FEED_URIS += " 
  #SRCDATE = "20070303"
  
  PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
- PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh12"
- PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh12"
+ PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13"
+ PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
  
 +PREFERRED_VERSION_file = "4.18"
 +PREFERRED_VERSION_file_native = "4.18"
  
  SRCDATE_gconf-dbus = "20060719"
  SRCDATE_gnome-vfs-dbus = "20060803"