From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 20 May 2006 18:24:39 +0000 (+0000)
Subject: merge of c0cfa6456fcf9d90a45c2a15139dcb2414db2c03
X-Git-Tag: Release-2010-05/1~9453^2~1665^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89ded6650e53252ce92bb12072a47f63badc918;p=openembedded.git

merge of c0cfa6456fcf9d90a45c2a15139dcb2414db2c03
     and f79576d9b9c2a65a2e9e5b3d7b7f1d4a57ea892a
---

f89ded6650e53252ce92bb12072a47f63badc918