From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 18 Jul 2005 08:15:26 +0000 (+0000)
Subject: merge of 905c8d454a8f78a32652b51edb7d9fc32edc640b
X-Git-Tag: Release-2010-05/1~9453^2~4135^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0304ae5a229a4b4b83b107c85e8567bbf471a31;p=openembedded.git

merge of 905c8d454a8f78a32652b51edb7d9fc32edc640b
     and 92e1739bb87cfcdf66038f7860c960bac859d2d1
---

c0304ae5a229a4b4b83b107c85e8567bbf471a31