From: ccsmart <ccsmart@smartpal.de>
Date: Fri, 16 Sep 2005 14:41:09 +0000 (+0000)
Subject: merge of 31484b3a457e2e2ecbac527a3655dd4adcd81277
X-Git-Tag: Release-2010-05/1~9453^2~3513^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b953a884d78372cfe22908014f12f0892db4e1;p=openembedded.git

merge of 31484b3a457e2e2ecbac527a3655dd4adcd81277
     and 36fdf65c91bd73e2934ded7c2f8bdc1714cfa51e
---

63b953a884d78372cfe22908014f12f0892db4e1