From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 7 Sep 2005 22:05:19 +0000 (+0000)
Subject: merge of 58b70d443320302d28d40f3bbd27c219a60956cb
X-Git-Tag: Release-2010-05/1~9453^2~3598
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bd541d01751acee647413bc82ca1467c04210bc;p=openembedded.git

merge of 58b70d443320302d28d40f3bbd27c219a60956cb
     and d4055289778245dd9f7f2e2649e8a6d4935189fd
---

3bd541d01751acee647413bc82ca1467c04210bc