From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 13 Jan 2006 21:23:10 +0000 (+0000)
Subject: merge of 1fd7665c4adb18dbc8ea2095452ff1fbac9c02be
X-Git-Tag: Release-2010-05/1~9453^2~2665^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b0416e0b125a9552582d0ed9f3b8795a5762285;p=openembedded.git

merge of 1fd7665c4adb18dbc8ea2095452ff1fbac9c02be
     and 5ce32db4a4b875809b5c8088f1c96b61c15e7bd1
---

6b0416e0b125a9552582d0ed9f3b8795a5762285