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

merge of 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842
     and 71481bacc3f57287881719e7dcde5ecfa6fd8492
---

84ed51d67f1e2af329df0814b6a1509b71d54a28