From: Koen Kooi <koen@openembedded.org>
Date: Mon, 5 Sep 2005 15:31:15 +0000 (+0000)
Subject: merge of 4d61b91c4301e551e3af7c94c94703dd49b8a5c3
X-Git-Tag: Release-2010-05/1~9453^2~3641
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e0429eeb5117c75fff0e2da0e07bc1a89f0dfc;p=openembedded.git

merge of 4d61b91c4301e551e3af7c94c94703dd49b8a5c3
     and a9ca95824a4fece974acb09126b3dc72162d45c0
---

a7e0429eeb5117c75fff0e2da0e07bc1a89f0dfc