From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 28 Jun 2006 19:34:00 +0000 (+0000)
Subject: merge of 857d29a477b23e8bc2f6523391fe6bbcb15cf15a
X-Git-Tag: Release-2010-05/1~9453^2~1409^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ac0e9d07429726f0c0ecd46db92ef8c46722bc8;p=openembedded.git

merge of 857d29a477b23e8bc2f6523391fe6bbcb15cf15a
     and 89e400b6f42a60c37056051e437ba68603f0727f
---

7ac0e9d07429726f0c0ecd46db92ef8c46722bc8