From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 7 Sep 2005 17:41:28 +0000 (+0000)
Subject: merge of 5163269103c7a889fa4bcc1beee6b8f4d5a63ef5
X-Git-Tag: Release-2010-05/1~9453^2~3603
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d63fb40ee8ff57301629d6e333f62cd139d1d32;p=openembedded.git

merge of 5163269103c7a889fa4bcc1beee6b8f4d5a63ef5
     and 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842
---

9d63fb40ee8ff57301629d6e333f62cd139d1d32