From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 9 Jun 2006 01:29:19 +0000 (+0000)
Subject: merge of 407bf0fc9b07e2530a5ccf8399950eab802626c0
X-Git-Tag: Release-2010-05/1~9453^2~1483
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7048fe41ae80e412790aaf588697df80984df3ce;p=openembedded.git

merge of 407bf0fc9b07e2530a5ccf8399950eab802626c0
     and 79d9baa2d56d813cea89497804b8c97f5d079df7
---

7048fe41ae80e412790aaf588697df80984df3ce