From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 17 Jun 2006 14:12:24 +0000 (+0000)
Subject: merge of b1413be68019496f10dcfa8c854fd6644adecd93
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=898415f09d438c2a930e34f1f62aecf640a2c68c;p=openembedded.git

merge of b1413be68019496f10dcfa8c854fd6644adecd93
     and f7ac7bd5a0590c19bff764ae19b67122b71ac9ac
---

898415f09d438c2a930e34f1f62aecf640a2c68c