From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 8 Aug 2005 15:16:40 +0000 (+0000)
Subject: merge of e9dd020fc3fd113d6a079b11a238249de03ff731
X-Git-Tag: Release-2010-05/1~9453^2~3946^2~18
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9707ef90ba9f1bdb4d9292bf4c241bf0c9716217;p=openembedded.git

merge of e9dd020fc3fd113d6a079b11a238249de03ff731
     and f9d3b94ab86532d41ac3eded503c6e47d6d8de4c
---

9707ef90ba9f1bdb4d9292bf4c241bf0c9716217