From: Derek Young <dyoung@nslu2-linux.org>
Date: Thu, 8 Sep 2005 18:16:15 +0000 (+0000)
Subject: merge of d69e4956ab53fe34863509b1011261827ec1a31a
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b1da51e0848b0d539135e03cbb3004bf043a6dc;p=openembedded.git

merge of d69e4956ab53fe34863509b1011261827ec1a31a
     and f3f1f261ab9e71cd08507505938f11006f96c54d
---

0b1da51e0848b0d539135e03cbb3004bf043a6dc