From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 31 Jul 2005 14:36:14 +0000 (+0000)
Subject: merge of 17cd385f326ee735c89b1dc43f11761e2f1a41f2
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f8f2fa15a84a82086823c8e03519a80e2d1b70;p=openembedded.git

merge of 17cd385f326ee735c89b1dc43f11761e2f1a41f2
     and 81b6d1dfdca16a87ee13d9c5e11b5d9945ffcb99
---

48f8f2fa15a84a82086823c8e03519a80e2d1b70