From: ccsmart <ccsmart@smartpal.de>
Date: Wed, 3 Aug 2005 18:04:42 +0000 (+0000)
Subject: merge of 01bc1e4867d2ea980ba68da0060879a34778c6c0
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~11^2~6^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a240f14289e5ebc59ca4e258da937ec72ecb789;p=openembedded.git

merge of 01bc1e4867d2ea980ba68da0060879a34778c6c0
     and 0e1ab5b1f00b1449bf4276ee3dc4eca65edea52c
---

6a240f14289e5ebc59ca4e258da937ec72ecb789