From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 5 Aug 2005 09:14:24 +0000 (+0000)
Subject: merge of 031940b53227ed6076cc3d5e00220f0f9f1013c6
X-Git-Tag: Release-2010-05/1~9453^2~3983
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4589d14559dd4b8f7ef93810549e12d1ee24d75;p=openembedded.git

merge of 031940b53227ed6076cc3d5e00220f0f9f1013c6
     and 246b163cc5c32e5b08f9265b553ca17e0240e59d
---

a4589d14559dd4b8f7ef93810549e12d1ee24d75