From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 19 Oct 2006 12:14:13 +0000 (+0000)
Subject: merge of 497af8d916ea71b5cc3ad879076fb96fd89b3ef9
X-Git-Tag: Release-2010-05/1~9453^2~567^2~94^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d716bca137a23ad13f0f0a57c7b50a22d25418d5;p=openembedded.git

merge of 497af8d916ea71b5cc3ad879076fb96fd89b3ef9
     and 4f4c1c975d8e241b60c1c145634b54180f6f1fb9
---

d716bca137a23ad13f0f0a57c7b50a22d25418d5