From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 7 Jul 2005 09:46:29 +0000 (+0000)
Subject: merge of 2109e112bb3a836e7b627253f84a9efa2a19f779
X-Git-Tag: Release-2010-05/1~9453^2~4221
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d69b4f83c4e5ba9ab0819e151d76474c698a224;p=openembedded.git

merge of 2109e112bb3a836e7b627253f84a9efa2a19f779
     and d5919dcd4efcc3277f396379d72ee2734c1b8924
---

0d69b4f83c4e5ba9ab0819e151d76474c698a224