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

merge of 2692c20b64cebd9a996a3ec7d793938f235c2cd6
     and 84ca6b48d0e2960ee88c5a4d6c227b9cc53e4d46
---

838a2822ca545f3685f6615d9b8f283b4c2e32b6