From: Koen Kooi <koen@openembedded.org>
Date: Tue, 23 Aug 2005 10:39:17 +0000 (+0000)
Subject: merge of 46e0039f24ae8a639a638dadeb0b8e88e8fb48b0
X-Git-Tag: Release-2010-05/1~9453^2~3843^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03b1a859b30576803a7be64d906537cc14055596;p=openembedded.git

merge of 46e0039f24ae8a639a638dadeb0b8e88e8fb48b0
     and 7e0579c485fc3de6e06a10b9db460e3ba59cd9e5
---

03b1a859b30576803a7be64d906537cc14055596