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

merge of c1c5f45706391426e8869790b447469783a6e15d
     and dac5598f960dc940e35412e5c4235baf09f4afbf
---

6f20a91c8266e70d52576d3c134e7e57ae938c6c