From: Mike Westerhof <mwester@dls.net>
Date: Tue, 18 Apr 2006 04:07:11 +0000 (+0000)
Subject: merge of b9ca9fd7f2a8108ba2e4ccd8ad4e71464cfa782e
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b208bcfb1424789fe7dd997f27af3260a98b2c;p=openembedded.git

merge of b9ca9fd7f2a8108ba2e4ccd8ad4e71464cfa782e
     and ee282fd56ede355c1afbe06deea556672508236c
---

97b208bcfb1424789fe7dd997f27af3260a98b2c