From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 18 Jan 2006 11:00:20 +0000 (+0000)
Subject: merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1
X-Git-Tag: Release-2010-05/1~9453^2~2627^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cff8772528f5bf97ac732a157b9daf63feab5c2;p=openembedded.git

merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1
     and b4a513218154eb17b59ed896ac7e0037ab11fc14
---

1cff8772528f5bf97ac732a157b9daf63feab5c2