From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 10 Aug 2005 16:47:52 +0000 (+0000)
Subject: merge of 802b5c32960cd36a01f851dc081ca5c7b123dec5
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~16
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57e9d2faad832e99be6b1ba6cbe9e743b5b99e3d;p=openembedded.git

merge of 802b5c32960cd36a01f851dc081ca5c7b123dec5
     and a7553a96f640438ec67f0ffe109c920e46e60972
---

57e9d2faad832e99be6b1ba6cbe9e743b5b99e3d