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

merge of 1ab8e3772bfbaecdabe093d92f28f8c2148e4f61
     and 231e6c9de778cfd05359c4ae1ef7485ffbacb78b
---

b30f2ba35f2f5e19fa8000315cb4a8e29d623303