From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 27 Jul 2005 23:18:57 +0000 (+0000)
Subject: merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
X-Git-Tag: Release-2010-05/1~9453^2~4017^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2b8df1751fed07eb5f57522705723d21c92a71f;p=openembedded.git

merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
     and 94f303eda501c5ec8e20584ef29de2ce84bf8ed7
---

d2b8df1751fed07eb5f57522705723d21c92a71f