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

merge of 233aad18afe0317b0afc6e143e39d9294ecaac1c
     and 56d931179ae335695ab62d15eda788fb64824645
---

6ffd2eda32dbedc9afea7dadf537f7fc50c47e5b