From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 Aug 2005 13:36:09 +0000 (+0000)
Subject: merge of bc8ebabb26be6b1995dede187f84d76cb364c344
X-Git-Tag: Release-2010-05/1~9453^2~3895^2~10^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e290814b9fb3e6712a82cad3695787c2833249f4;p=openembedded.git

merge of bc8ebabb26be6b1995dede187f84d76cb364c344
     and de31bae9925b81f8c7cff9b208bebeffced17654
---

e290814b9fb3e6712a82cad3695787c2833249f4