From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 4 Aug 2005 16:14:36 +0000 (+0000)
Subject: merge of 62f17dde6e02af42bf4eab7e425978b66cea3823
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1bd6a8c28ffb85dd2f786d2bdf99b88316012c7;p=openembedded.git

merge of 62f17dde6e02af42bf4eab7e425978b66cea3823
     and 7b0d9a3014b9a4ec491547577decf4b403df8b04
---

c1bd6a8c28ffb85dd2f786d2bdf99b88316012c7