From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 26 Sep 2005 17:07:08 +0000 (+0000)
Subject: merge of 05dd4ce9d2ee0995688e45e60a21534114fbc45f
X-Git-Tag: Release-2010-05/1~9453^2~3412
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206647fb6ccf68137a2793c913053579f4553244;p=openembedded.git

merge of 05dd4ce9d2ee0995688e45e60a21534114fbc45f
     and 58382d22f4140021f828ad1271f9f7700cde6b0c
---

206647fb6ccf68137a2793c913053579f4553244