From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 5 Aug 2005 11:44:24 +0000 (+0000)
Subject: merge of 5c853caed3eb7f82f8393ee8dd12837a0ffab8b9
X-Git-Tag: Release-2010-05/1~9453^2~3979
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89914292284234eee244aefacbd936ac0d90a1cd;p=openembedded.git

merge of 5c853caed3eb7f82f8393ee8dd12837a0ffab8b9
     and bdc1b4daae6c0dc9020f74804c53a21cd9c61212
---

89914292284234eee244aefacbd936ac0d90a1cd