From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Oct 2005 10:11:30 +0000 (+0000)
Subject: merge of 190f2a680fcbd7ef0c24337df43378bded12f048
X-Git-Tag: Release-2010-05/1~9453^2~3286
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f2f623da0cccd2eae320f9353bd915cc59a5af3;p=openembedded.git

merge of 190f2a680fcbd7ef0c24337df43378bded12f048
     and 665676b78fde532560ccfc82e50fa0416cee55c5
---

0f2f623da0cccd2eae320f9353bd915cc59a5af3