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

merge of 1f17c3b6458d62a2ad93a3e2025d6308394ee150
     and ecf0ce2fc59cf271ca00eb5fbcf693ff1d4e024a
---

8021271088be785fc4695e73142f9f8cb1590ed2