From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 7 Aug 2005 21:12:42 +0000 (+0000)
Subject: merge of 299d7ad50c11e98b4229b447db0f230399d5b808
X-Git-Tag: Release-2010-05/1~9453^2~3955
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a1348f4d4469c2a0cb820172c5762644652ace6;p=openembedded.git

merge of 299d7ad50c11e98b4229b447db0f230399d5b808
     and eadb0128d53a398e63b8038f387db6940e12a469
---

2a1348f4d4469c2a0cb820172c5762644652ace6