From: Koen Kooi <koen@openembedded.org>
Date: Thu, 25 Aug 2005 12:57:21 +0000 (+0000)
Subject: merge of 1892913050b4a9d4204f2fb9202f7cd6d84c0e99
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca511b708ffe81ccafa1a195305bfe2807ec08e5;p=openembedded.git

merge of 1892913050b4a9d4204f2fb9202f7cd6d84c0e99
     and 4658c406381ad92cb210db3eab6524bb631a717d
---

ca511b708ffe81ccafa1a195305bfe2807ec08e5