From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 May 2006 22:21:24 +0000 (+0000)
Subject: merge of 38c34687521951dd251b87f48f5c8a4edeced577
X-Git-Tag: Release-2010-05/1~9453^2~1712^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87de4ed990d8a621082a346a40a0db0c52d94eb;p=openembedded.git

merge of 38c34687521951dd251b87f48f5c8a4edeced577
     and 696c4941de7c904623c36f238e02fea6008a7567
---

c87de4ed990d8a621082a346a40a0db0c52d94eb