From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Jul 2006 17:25:47 +0000 (+0000)
Subject: merge of c24a7375060d5ad599851af14ea91bce14d3092b
X-Git-Tag: Release-2010-05/1~9453^2~1350
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b36fe68738ea7f4b4cc9d5fd82477d066d2f1b9;p=openembedded.git

merge of c24a7375060d5ad599851af14ea91bce14d3092b
     and d590807735761852af55b2d7ebce85ba1dcd42d1
---

3b36fe68738ea7f4b4cc9d5fd82477d066d2f1b9