From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 Aug 2005 22:02:30 +0000 (+0000)
Subject: merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c
X-Git-Tag: Release-2010-05/1~9453^2~3895^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308a3289426a73ae7c5493c1704365955e3ccd82;p=openembedded.git

merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c
     and 3c94be02c338e9f42138bc4421a6de729400db41
---

308a3289426a73ae7c5493c1704365955e3ccd82