From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 May 2006 12:56:48 +0000 (+0000)
Subject: merge of 1790fd843078a2ebd98288de3336054f298213fa
X-Git-Tag: Release-2010-05/1~9453^2~1709^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f58a7033eed8b93d55f28eb77e6564f4ce3cebe;p=openembedded.git

merge of 1790fd843078a2ebd98288de3336054f298213fa
     and 365caef70205e8aaef5c4715bb034a6e23ef0113
---

2f58a7033eed8b93d55f28eb77e6564f4ce3cebe