From: Derek Young <dyoung@nslu2-linux.org>
Date: Wed, 7 Sep 2005 14:17:38 +0000 (+0000)
Subject: merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
X-Git-Tag: Release-2010-05/1~9453^2~3589^2^2~1^2~1^2~2^2^2~4^2^2^2^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0507453371c86072d2fb828a6bf5a57d4100bf0;p=openembedded.git

merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
     and ac2b9a5563ecd104e4cbc35df4128a369b2279b2
---

b0507453371c86072d2fb828a6bf5a57d4100bf0