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

merge of 1259794e0c84040e49ab53241786b7c7689b69b5
     and 6f2e2d1cbff36ea646f11c263458c798a60321c8
---

3ec7ed7cf8e972422483bb847774cdbe8e24a5f3