From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 26 Aug 2005 09:47:31 +0000 (+0000)
Subject: merge of 3a8d976edec8e170e572b6281c1d290e82e766ee
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad3b54a8385f73950e943c1e1a975d7823c05abf;p=openembedded.git

merge of 3a8d976edec8e170e572b6281c1d290e82e766ee
     and dc2238d7bd47c01641da36969ca532175cee09d9
---

ad3b54a8385f73950e943c1e1a975d7823c05abf