From: Erik Hovland <erik@hovland.org>
Date: Tue, 22 Aug 2006 20:16:18 +0000 (+0000)
Subject: merge of '7bf39cf992a3dbe062066db3100333fa62967447'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~122^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff49b42aedb3c09f71cb35456140b9afcf6b40b8;p=openembedded.git

Merge ... '7bf39cf992a3dbe062066db3100333fa62967447'
     and 'd31705a022a5624d8e85880ced6f1e90daa6d840'
---

ff49b42aedb3c09f71cb35456140b9afcf6b40b8
diff --cc packages/glibc/glibc_2.3.5+cvs20050627.bb
index 87e8ee40e2,fbab2d7afc..31105c8adb
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@@ -55,7 -55,8 +55,9 @@@ SRC_URI = "http://familiar.handhelds.or
  	   file://ldsocache-varrun.patch;patch=1 \
  	   file://5090_all_stubs-rule-fix.patch;patch=1 \
  	   file://raise.patch;patch=1 \
- 	   file://zecke-sane-readelf.patch;patch=1 \
++       file://zecke-sane-readelf.patch;patch=1 \
+ 	   file://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \
+ 	   file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \
             file://etc/ld.so.conf \
  	   file://generate-supported.mk"