From: Derek Young <dyoung@nslu2-linux.org>
Date: Mon, 29 Aug 2005 22:01:10 +0000 (+0000)
Subject: merge of 558bb65faf7c2974476686b49c96141cd99dd145
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~3^2~1^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be7329be872d38a4d6cd94b33da655276ec4a681;p=openembedded.git

merge of 558bb65faf7c2974476686b49c96141cd99dd145
     and 697cade2183f67dfff37e0d7896d63862e7c6b4e
---

be7329be872d38a4d6cd94b33da655276ec4a681