From: Koen Kooi <koen@openembedded.org>
Date: Thu, 22 Sep 2005 20:08:44 +0000 (+0000)
Subject: merge of 3918e04d271278074bcf12fe4c07ea259cbc92b0
X-Git-Tag: Release-2010-05/1~9453^2~3456
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2e5511b5d1eb3faffb47e92fa11136df715aaff;p=openembedded.git

merge of 3918e04d271278074bcf12fe4c07ea259cbc92b0
     and ba30bfad08ba6c051b42fb8b245a2323db4719d9
---

a2e5511b5d1eb3faffb47e92fa11136df715aaff