From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 29 Sep 2005 12:11:39 +0000 (+0000)
Subject: merge of 0f9bc56e68821bb651a30e8104863bd4c869dc05
X-Git-Tag: Release-2010-05/1~9453^2~3395^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18239318c7ed794f9b2959be8a9702569468cc31;p=openembedded.git

merge of 0f9bc56e68821bb651a30e8104863bd4c869dc05
     and 60733b040ba9bcfac4ef0384ce2cd7236effb91b
---

18239318c7ed794f9b2959be8a9702569468cc31