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

merge of 50b29d3f0371ac55da68a61f56708b4328771ff8
     and faeeb5743e7d90afa967cc6e82faae5fd092e5c0
---

e02d95f685271402cfbf4294e706fb067fbb695e