From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 1 Dec 2005 19:14:01 +0000 (+0000)
Subject: merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77
X-Git-Tag: Release-2010-05/1~9453^2~2988
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=233688ec51a458d7833f331c1966582808eb6be6;p=openembedded.git

merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77
     and b17f8aca9921dd6c79812ee173e34e711b252634
---

233688ec51a458d7833f331c1966582808eb6be6