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

merge of 6332ba3ac06255d82b54e9a1a69e726c1de4d14f
     and e8386a3fd1880af0122ee50c8a1b249ada79c9ea
---

ef83a04e3672a415e651bcd45ad5bbf74a85243a