From: ccsmart <ccsmart@smartpal.de>
Date: Thu, 4 Aug 2005 17:26:04 +0000 (+0000)
Subject: merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df
X-Git-Tag: Release-2010-05/1~9453^2~3996
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=194e9823419ad76b29d14edb3733c18009fe3311;p=openembedded.git

merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df
     and c579a3af7687e512137c2653f94a4b14ce3b4d4f
---

194e9823419ad76b29d14edb3733c18009fe3311