From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Oct 2005 09:06:59 +0000 (+0000)
Subject: merge of afb8a8c72b9f95f42b8ac9092aca5417404b46b7
X-Git-Tag: Release-2010-05/1~9453^2~3373
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c9535c1c193f75cb73f4f09182ae49172f3d889;p=openembedded.git

merge of afb8a8c72b9f95f42b8ac9092aca5417404b46b7
     and e6a4f3e9ea007d2b58e5b311715b7de8eff61b8d
---

4c9535c1c193f75cb73f4f09182ae49172f3d889