From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Jul 2005 17:05:34 +0000 (+0000)
Subject: merge of 309baf9561eba78495d1b59322a8ebca28e571bc
X-Git-Tag: Release-2010-05/1~9453^2~4243^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063bddde698a5d99995ceaa5de2f89b89417f67d;p=openembedded.git

merge of 309baf9561eba78495d1b59322a8ebca28e571bc
     and 9493767780c108c1eb032fd49a0a9898244577b9
---

063bddde698a5d99995ceaa5de2f89b89417f67d