From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 28 Jul 2006 11:44:26 +0000 (+0000)
Subject: merge of 4c2bff0a75bafec17f894f5e677f4b07f8d120c8
X-Git-Tag: Release-2010-05/1~9453^2~1070^2~3^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9b4063d1628260c82644cc466984349cb5e4142;p=openembedded.git

merge of 4c2bff0a75bafec17f894f5e677f4b07f8d120c8
     and c77cc66707f3afa1dbccc1b73d6de5cfc836058e
---

a9b4063d1628260c82644cc466984349cb5e4142