From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 26 May 2006 12:56:04 +0000 (+0000)
Subject: merge of 6c892a12e5ecbf776b1486325e3502f44bfbee00
X-Git-Tag: Release-2010-05/1~9453^2~1617
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5357d974467d9751a375d8db6d52ee98eeb180e;p=openembedded.git

merge of 6c892a12e5ecbf776b1486325e3502f44bfbee00
     and a28eb0331581874fd47b01b78e86dc73b0c99fcd
---

e5357d974467d9751a375d8db6d52ee98eeb180e