From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 26 Sep 2006 09:23:07 +0000 (+0000)
Subject: merge of 5792a180891dc27533ab8ad97885291db48258e8
X-Git-Tag: Release-2010-05/1~9453^2~696
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d5a39acc94417b40bedc12ea38596437754412;p=openembedded.git

merge of 5792a180891dc27533ab8ad97885291db48258e8
     and 78ea8c7c6f458cae167191d20cb6ab2ed244b355
---

79d5a39acc94417b40bedc12ea38596437754412