From: ccsmart <ccsmart@smartpal.de>
Date: Wed, 21 Sep 2005 12:05:30 +0000 (+0000)
Subject: merge of 15102cf542cc997f3e0ddb34d8f69395cdf724c0
X-Git-Tag: Release-2010-05/1~9453^2~3474
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cac237d6d44bb53b78e92e2381fe969103ef166b;p=openembedded.git

merge of 15102cf542cc997f3e0ddb34d8f69395cdf724c0
     and 26c9a4c6e4fd286acde8c53cec3cd492e7bbd3cf
---

cac237d6d44bb53b78e92e2381fe969103ef166b