From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Apr 2006 16:56:30 +0000 (+0000)
Subject: merge of 059e51f284488d43836324f6cfbc2d76b6d919c9
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d68be4b3a70404dc951e5159582d8830e2bcc193;p=openembedded.git

merge of 059e51f284488d43836324f6cfbc2d76b6d919c9
     and d0b3b64609328efd34da7b4029169e4d92f782fc
---

d68be4b3a70404dc951e5159582d8830e2bcc193