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

merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
     and fbc9813ed42c80708764b24a8a84d5a0b58fe88d
---

f79b582974b16f88e31f32e55de23807c26fcf99