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

merge of 07404ec3a67131316115b73164e986846f86b338
     and 7d11ffee028230233f5668e949bbe6b774f61771
---

e7666e67c9ec639a14ebd780c387f6d52ca27fad