From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 26 Aug 2005 16:33:10 +0000 (+0000)
Subject: merge of 2f7b3d5a4cb419e012fd15bb7d621b195cd4bc84
X-Git-Tag: Release-2010-05/1~9453^2~3779
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74aa329f71e25ede9a5b222c952cd8d6cffca1ac;p=openembedded.git

merge of 2f7b3d5a4cb419e012fd15bb7d621b195cd4bc84
     and 32b3aa5b585c31c96bc1f6e98bc36a1a56f87166
---

74aa329f71e25ede9a5b222c952cd8d6cffca1ac