From: Derek Young <dyoung@nslu2-linux.org>
Date: Mon, 29 Aug 2005 22:32:24 +0000 (+0000)
Subject: merge of 20908dd2ac3934b841281cc067b55d92b071b172
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~3^2~1^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=051377aaefcf249db0602a0ea3800b0aa73a85fd;p=openembedded.git

merge of 20908dd2ac3934b841281cc067b55d92b071b172
     and d05618e2ffb76c986540067b57ddf9113d582627
---

051377aaefcf249db0602a0ea3800b0aa73a85fd