From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Apr 2006 11:45:19 +0000 (+0000)
Subject: merge of adbb0fa00fc14211e7902e17eb9ca516f0d13f44
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5488fab2f9fa40106165088bf81c91d76854249;p=openembedded.git

merge of adbb0fa00fc14211e7902e17eb9ca516f0d13f44
     and d21402039fbf5e29301a8367351ee97cf94887bf
---

e5488fab2f9fa40106165088bf81c91d76854249