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

merge of 3bce23b65aa15f7e7004b8d10ea82415547c11d6
     and 79101cb27f895ead25974ab455fb7cbbcb030caa
---

c694c15b154f19c043c262af1ba864817a53a40c