From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 4 Aug 2005 17:25:25 +0000 (+0000)
Subject: merge of 3312c8f3a63ff90c42c1a421b659e0cd17696424
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019903803d5b8d1fead525d1f0d197b1786c1b8c;p=openembedded.git

merge of 3312c8f3a63ff90c42c1a421b659e0cd17696424
     and 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df
---

019903803d5b8d1fead525d1f0d197b1786c1b8c