From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 6 Jul 2006 12:04:54 +0000 (+0000)
Subject: merge of 6de86d14a70c1fff678e2d61e0d87e5bb56444ef
X-Git-Tag: Release-2010-05/1~9453^2~1325^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da2f4d0b4ca9c7b073f2888d77b1d12a7688743;p=openembedded.git

merge of 6de86d14a70c1fff678e2d61e0d87e5bb56444ef
     and edd37393c94a6f987d935aa89ae084b99c41d5d5
---

5da2f4d0b4ca9c7b073f2888d77b1d12a7688743