From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 27 Mar 2006 12:18:29 +0000 (+0000)
Subject: merge of 85fd10648ec4aa2a8ae0c12145857b60fe032501
X-Git-Tag: Release-2010-05/1~9453^2~2117
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad4e168977abab55356cc865629645609751e990;p=openembedded.git

merge of 85fd10648ec4aa2a8ae0c12145857b60fe032501
     and 9c5379a0c5df10e0d169d6dd5f45ec4644656971
---

ad4e168977abab55356cc865629645609751e990