From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 31 Jul 2005 23:23:58 +0000 (+0000)
Subject: merge of 0f708a1a283427a436a4dde390b7d5fdc54f35e6
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~4^2~4^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54493d24f6693389e728961d567cebfe69c9bc35;p=openembedded.git

merge of 0f708a1a283427a436a4dde390b7d5fdc54f35e6
     and b1872f89ec8b07b1e4d80e4ed9e0b397da5f4f3a
---

54493d24f6693389e728961d567cebfe69c9bc35