From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 29 Mar 2006 13:11:26 +0000 (+0000)
Subject: merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~42^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c157ad6287aa649414f24cbf3170c9e9ed7b41a6;p=openembedded.git

merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8
     and f0b12dffc2020212cecbe63130285d68a1897b93
---

c157ad6287aa649414f24cbf3170c9e9ed7b41a6