From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 1 Aug 2005 09:45:42 +0000 (+0000)
Subject: merge of 5c8caead42a2c879d5b9eb133d13144c60bf2346
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~24^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14d3881700b6e5cd6b6b414bf81094b2e0d903c;p=openembedded.git

merge of 5c8caead42a2c879d5b9eb133d13144c60bf2346
     and 62eeefaa89d513cdd098f1ea6a4495d34289f621
---

a14d3881700b6e5cd6b6b414bf81094b2e0d903c