From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 6 Jun 2006 21:06:31 +0000 (+0000)
Subject: merge of 32d700ed29f263f43a84f4a55a5cead4c12d033f
X-Git-Tag: Release-2010-05/1~9453^2~1494^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb51887c6fd1ed22c19c32e4b755345649e7623d;p=openembedded.git

merge of 32d700ed29f263f43a84f4a55a5cead4c12d033f
     and ad154a8528a3434623dd460bc473c8f854d9ed45
---

bb51887c6fd1ed22c19c32e4b755345649e7623d