From: Derek Young <dyoung@nslu2-linux.org>
Date: Fri, 2 Sep 2005 11:17:08 +0000 (+0000)
Subject: merge of 4bd9a63f8807f4b1963f6fc396e9807603315627
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c17b9f55ac71ac77c90c5e42e2ee4ab063fa1cb;p=openembedded.git

merge of 4bd9a63f8807f4b1963f6fc396e9807603315627
     and b144329bc02b11109562f08443c2ce7a241f9d1f
---

8c17b9f55ac71ac77c90c5e42e2ee4ab063fa1cb