From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 3 Aug 2005 14:38:42 +0000 (+0000)
Subject: merge of 160027e459479e16ccb9e2adf9a086fd90ac1468
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~19
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c9716a22ad504f1aebc55dacf96f6e57618907;p=openembedded.git

merge of 160027e459479e16ccb9e2adf9a086fd90ac1468
     and 4fe48134c142abde40ddd2becfe6af4c646c5e00
---

02c9716a22ad504f1aebc55dacf96f6e57618907