From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 Aug 2005 13:27:42 +0000 (+0000)
Subject: merge of 505f6e001e3fc7e1bda5010a429e1d963b181ba7
X-Git-Tag: Release-2010-05/1~9453^2~3967^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3ce4c79db53e524a3390eb8c241521cef118c87;p=openembedded.git

merge of 505f6e001e3fc7e1bda5010a429e1d963b181ba7
     and ebc68fd9ca2fd9efd955596d84e5d748bea4b8e4
---

a3ce4c79db53e524a3390eb8c241521cef118c87