From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 00:36:27 +0000 (+0000)
Subject: merge of 8d3442fcb877c62f84beb9bb2c6c44ae23bac641
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~153
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aba820a55ef17a7eb05ed67053b41cd0859e62ac;p=openembedded.git

merge of 8d3442fcb877c62f84beb9bb2c6c44ae23bac641
     and 9e897250583824d4601feaa3b5b91e1ab95da88d
---

aba820a55ef17a7eb05ed67053b41cd0859e62ac