From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Aug 2005 12:00:45 +0000 (+0000)
Subject: merge of 024765e1dedb38db9ab1fa38f91d192e8c340dfb
X-Git-Tag: Release-2010-05/1~9453^2~3843
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=639df729bedfa9e2ed58c8a7e7240d05a23752d2;p=openembedded.git

merge of 024765e1dedb38db9ab1fa38f91d192e8c340dfb
     and 3fc63b4e706cb671fbd1f5a6170be7a7a3473c92
---

639df729bedfa9e2ed58c8a7e7240d05a23752d2