From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 14 Aug 2005 23:01:28 +0000 (+0000)
Subject: merge of 24e85069eaef121ddb29e2dc3539a98c5ab3b6aa
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b160c6be87e51e4f3c0652d0255bebdb39bd099f;p=openembedded.git

merge of 24e85069eaef121ddb29e2dc3539a98c5ab3b6aa
     and 978b81b24a21690b8a090d704ca40512790ad868
---

b160c6be87e51e4f3c0652d0255bebdb39bd099f