From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 7 Aug 2005 10:49:27 +0000 (+0000)
Subject: merge of bd296c637a24b7be6993653a2922069c43373e63
X-Git-Tag: Release-2010-05/1~9453^2~3959^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f64d1932814031355e086ad2e958d8888187f1;p=openembedded.git

merge of bd296c637a24b7be6993653a2922069c43373e63
     and c9215942285997ecf417d0322c5cf0ff7542ea2b
---

14f64d1932814031355e086ad2e958d8888187f1