From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 9 Aug 2005 10:46:10 +0000 (+0000)
Subject: merge of 27ce3dcb3ae4cdeafc78be0419448c83a31e6c86
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~24^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f603ad225becb7149cfde643c3f868dd4db275db;p=openembedded.git

merge of 27ce3dcb3ae4cdeafc78be0419448c83a31e6c86
     and b545254923165588edbe4ef88061c70e7283ec17
---

f603ad225becb7149cfde643c3f868dd4db275db