From: Derek Young <dyoung@nslu2-linux.org>
Date: Thu, 8 Sep 2005 00:15:59 +0000 (+0000)
Subject: merge of 8f015baa662d192e99b12916d23d852bce98af04
X-Git-Tag: Release-2010-05/1~9453^2~3589^2^2~1^2~1^2~2^2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fd3a8a0b5089c52f39e6765fb0cee4dba5044cd;p=openembedded.git

merge of 8f015baa662d192e99b12916d23d852bce98af04
     and 9f0eb94a2ab5c33776fdb1e56a08737557f04e1a
---

9fd3a8a0b5089c52f39e6765fb0cee4dba5044cd