From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Jul 2005 08:51:53 +0000 (+0000)
Subject: merge of 852a5931df198c319ddd37aafce0001ae839df46
X-Git-Tag: Release-2010-05/1~9453^2~4124^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101f43eb25f75463ab69a1b2e68959e5cd6cb659;p=openembedded.git

merge of 852a5931df198c319ddd37aafce0001ae839df46
     and e109156250767b8fafcee6f70ed990161ec858d1
---

101f43eb25f75463ab69a1b2e68959e5cd6cb659