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

merge of 286a5cadf7726262c13fd2d631d3f2bf15fddf5f
     and 354e8aead2f1733a96819f95e5fa09d14685b639
---

b16010c13c5451a8a610f4120e9a2dc33f920677