From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Jun 2006 18:23:30 +0000 (+0000)
Subject: merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017b42a2a426c816780af98c28b30d3bfb3c67e6;p=openembedded.git

merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
     and 8bed42c6d1a57ad595de378d393b40c7bd3e997f
---

017b42a2a426c816780af98c28b30d3bfb3c67e6