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

merge of 58b70d443320302d28d40f3bbd27c219a60956cb
     and 9f2634a3c17a2dc22fa4a956cc26a1e6db232dc3
---

2fb0a1a74ee2d45c923c48a1cd14e171068b3bc7