From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 3 Feb 2006 21:10:17 +0000 (+0000)
Subject: merge of b8ec663985e414ccfe39f06489f001bf60b50a0b
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d79e20a4ae0620cec67b56d8e007a1973f5959a;p=openembedded.git

merge of b8ec663985e414ccfe39f06489f001bf60b50a0b
     and cecb9f4ed88a2986bdd6aa503026a79211b79375
---

2d79e20a4ae0620cec67b56d8e007a1973f5959a