From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Apr 2006 15:27:00 +0000 (+0000)
Subject: merge of 57ac60221ec66341d6031290ebe0ea39dea0b9c7
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64a0899b9317814694d2a80b42edd7f0896d1507;p=openembedded.git

merge of 57ac60221ec66341d6031290ebe0ea39dea0b9c7
     and 9e2b0b36ac437fa39c2d640705951c444373f8c8
---

64a0899b9317814694d2a80b42edd7f0896d1507