From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 3 Aug 2005 18:53:33 +0000 (+0000)
Subject: merge of 2e8724564f1be9e0e883e070fe0666659493959e
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a36bed12ccb9f09981de5fa0585992a5e438c9;p=openembedded.git

merge of 2e8724564f1be9e0e883e070fe0666659493959e
     and 40fe86e812c95b7e5f5a1062bef6156d8d2f77eb
---

12a36bed12ccb9f09981de5fa0585992a5e438c9