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

merge of ba1902d8dbd8a626bad7a6b5ace212501925610e
     and f96e24038885c7474538e1f7a2893fd0fb5492ae
---

83942878a1209397dddf7eb30c0f25d9c30c6629