From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 31 Jan 2006 10:54:26 +0000 (+0000)
Subject: merge of 379077a1fae1f193142e23eba34b908f1c6c7491
X-Git-Tag: Release-2010-05/1~9453^2~2486
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf56c6de2afde559bd574d8a5b4238d883214f90;p=openembedded.git

merge of 379077a1fae1f193142e23eba34b908f1c6c7491
     and fe1ec31f3dd593d62186ad1c3ebd437c7df45777
---

bf56c6de2afde559bd574d8a5b4238d883214f90