From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 24 Jul 2005 17:04:53 +0000 (+0000)
Subject: merge of 295b25bdccb71c5cb89674e861313d3fc4dd8aa8
X-Git-Tag: Release-2010-05/1~9453^2~4072
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95518ec8597966b9ece558e5fa4c56abd4834ab;p=openembedded.git

merge of 295b25bdccb71c5cb89674e861313d3fc4dd8aa8
     and 6311b4a3e3e4d0a0680848dadc193d5790149001
---

f95518ec8597966b9ece558e5fa4c56abd4834ab