From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 29 Aug 2006 13:50:13 +0000 (+0000)
Subject: merge of b20c3c5a8f28ed4e47ac9afd5626ef9138ad0c95
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82eed0ff80f86d1b78c8c0ce06fa0689a81be555;p=openembedded.git

merge of b20c3c5a8f28ed4e47ac9afd5626ef9138ad0c95
     and b7799ca5f38be5d5b31eafe3229e04bd95f48e05
---

82eed0ff80f86d1b78c8c0ce06fa0689a81be555