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

merge of 6fb4978a07ca11f96878426dfaf26f3aab7778c8
     and e464450f2362ae2c974ed0a3bbc9625a5d27bcba
---

083f56b730e6ba109dca549652b9098f7fc5efbf