From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 24 Apr 2006 08:12:39 +0000 (+0000)
Subject: merge of d82f1294da436f4c180db853fffef16a6b811b28
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13aaf9747432dbad3420fc238e2765cf493ee78b;p=openembedded.git

merge of d82f1294da436f4c180db853fffef16a6b811b28
     and d9f2b0cf0a3d1cb9bda168d3802b0398efb83db9
---

13aaf9747432dbad3420fc238e2765cf493ee78b