From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 30 Jul 2005 00:18:01 +0000 (+0000)
Subject: merge of 1d24ccd116b8a70c0a23a022713e88fbe6c83097
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~22^2^2~1^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5c8187d1dedfb7898588c6d31a2692217793f38;p=openembedded.git

merge of 1d24ccd116b8a70c0a23a022713e88fbe6c83097
     and 585ac18d7511f158fae90c01f9583c6ce379805d
---

e5c8187d1dedfb7898588c6d31a2692217793f38