From: Derek Young <dyoung@nslu2-linux.org>
Date: Tue, 30 Aug 2005 15:01:53 +0000 (+0000)
Subject: merge of 729ea50cb25de52bb1584824196cf92dc2c1cc50
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~3^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6393fd6e86431741c2285b5e7872436c41dad6f8;p=openembedded.git

merge of 729ea50cb25de52bb1584824196cf92dc2c1cc50
     and 8032192230077b09d16100e880211ea479093f78
---

6393fd6e86431741c2285b5e7872436c41dad6f8