From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Aug 2005 21:24:15 +0000 (+0000)
Subject: merge of 2fcf6fe8d1d98bbe857dbbd186838951682572e9
X-Git-Tag: Release-2010-05/1~9453^2~3837
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8275e909cfe61880609a60921a9b9b816b79e08e;p=openembedded.git

merge of 2fcf6fe8d1d98bbe857dbbd186838951682572e9
     and 3b9315d4df23473fc5551d996c8624f0927d0dfb
---

8275e909cfe61880609a60921a9b9b816b79e08e