From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 5 Jun 2006 19:19:18 +0000 (+0000)
Subject: merge of 371519ee16090c31f871dd775b4e4d1660ac9b5a
X-Git-Tag: Release-2010-05/1~9453^2~1419^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d497e7d0b948032b5d6c00ba6ca3d8f6986e1c92;p=openembedded.git

merge of 371519ee16090c31f871dd775b4e4d1660ac9b5a
     and 58064edf80749f708183ec81472dc2950f816a94
---

d497e7d0b948032b5d6c00ba6ca3d8f6986e1c92