From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 25 Aug 2005 14:15:39 +0000 (+0000)
Subject: merge of 442f062be604dc778760de19d17e0429b815330f
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc0a1e075036a8dc25ae9b85000d3d439343d585;p=openembedded.git

merge of 442f062be604dc778760de19d17e0429b815330f
     and aefd8b85d8866ff05ae03c31658567c0a0d18d11
---

dc0a1e075036a8dc25ae9b85000d3d439343d585