From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 25 Apr 2006 11:56:25 +0000 (+0000)
Subject: merge of 61aa408f3a01fffc55bb2aa59c4801f8c68ec695
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e9ec3d5cdfbd7223cab5fe15277a17139775aca;p=openembedded.git

merge of 61aa408f3a01fffc55bb2aa59c4801f8c68ec695
     and bf6be0792ee7f592df6a7940fb7b0bf86f833157
---

2e9ec3d5cdfbd7223cab5fe15277a17139775aca