From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 10 Aug 2005 18:04:22 +0000 (+0000)
Subject: merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ffa72b197532abce18be4b46e994a1a70bb37fe;p=openembedded.git

merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c
     and cfbd36ce13c068634dfe838d6e4d7e1980011a9b
---

5ffa72b197532abce18be4b46e994a1a70bb37fe