From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 8 Jul 2005 04:45:11 +0000 (+0000)
Subject: merge of 31d634290b40d4d8cc5d473e180317f3a7ffbe71
X-Git-Tag: Release-2010-05/1~9453^2~4206^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93571c010a1817a1de9e8674dc401f8979781acf;p=openembedded.git

merge of 31d634290b40d4d8cc5d473e180317f3a7ffbe71
     and 45e454c99aff34d6ae66bd0a87997bf9543dd882
---

93571c010a1817a1de9e8674dc401f8979781acf