From: Derek Young <dyoung@nslu2-linux.org>
Date: Tue, 30 Aug 2005 16:01:18 +0000 (+0000)
Subject: merge of 109f30daf7a26b1cac99e95bb47b44100b625bd7
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c5f6fb16d68b653ca5dadf3f40c9db8d822df56;p=openembedded.git

merge of 109f30daf7a26b1cac99e95bb47b44100b625bd7
     and ec7219dd8333a54ac4264075615291dc9b5db3ca
---

6c5f6fb16d68b653ca5dadf3f40c9db8d822df56