From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 1 Aug 2005 10:14:05 +0000 (+0000)
Subject: merge of d161fb82f9d1ec0a546a8c69497c077f271e3659
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~22
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff514b49e55c14b560fdde48d0e96c7b4541e834;p=openembedded.git

merge of d161fb82f9d1ec0a546a8c69497c077f271e3659
     and d92544c17e3d96c540fd722492b3abde4b91c2f6
---

ff514b49e55c14b560fdde48d0e96c7b4541e834