From: Koen Kooi <koen@openembedded.org>
Date: Tue, 4 Jul 2006 17:42:49 +0000 (+0000)
Subject: merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fbcf379bbd88204d7dd396415bbb65346feeaab;p=openembedded.git

merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
     and f69ed55f40216d16d8f1cb7559d13b46385991b2
---

3fbcf379bbd88204d7dd396415bbb65346feeaab