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

merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
     and 9792e719eb583975723dd832d438c9d79abef870
---

9de7b951dc5d8402690db2ffe7a77ed0f1c31995