From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 2 Jul 2005 00:07:11 +0000 (+0000)
Subject: merge of 3a90bb2a96133732a5f60c88043d4ec81591720c
X-Git-Tag: Release-2010-05/1~9453^2~4258
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6f1f81249e1358e09c77b192430d883682bf5ca;p=openembedded.git

merge of 3a90bb2a96133732a5f60c88043d4ec81591720c
     and 8e63001b71c44d7180fad5cb696c1f236ca499bf
---

c6f1f81249e1358e09c77b192430d883682bf5ca