From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 29 Aug 2005 21:48:22 +0000 (+0000)
Subject: merge of 1008f485c5a4815b155d1b11108fdcf704c936bf
X-Git-Tag: Release-2010-05/1~9453^2~3743
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac9aa71d0d9d36ae6cd07f37c50d6992e384cb29;p=openembedded.git

merge of 1008f485c5a4815b155d1b11108fdcf704c936bf
     and 697cade2183f67dfff37e0d7896d63862e7c6b4e
---

ac9aa71d0d9d36ae6cd07f37c50d6992e384cb29