From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 11 Jul 2005 17:27:18 +0000 (+0000)
Subject: merge of 2022049443b7792bb0aa83a3718b39fa33c7a995
X-Git-Tag: Release-2010-05/1~9453^2~4193
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c15bff9b38d0fd2e6d13970a1ee5ba335a7948c;p=openembedded.git

merge of 2022049443b7792bb0aa83a3718b39fa33c7a995
     and 9d0d3641c8a092e15958fde6df3c0a92fc97a122
---

6c15bff9b38d0fd2e6d13970a1ee5ba335a7948c