From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 25 Apr 2006 18:50:34 +0000 (+0000)
Subject: merge of 01d13ac2c361ef4b10719889dea72fd4630df482
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03978ed0dbd7b718171cfe8605b65ea4da20a146;p=openembedded.git

merge of 01d13ac2c361ef4b10719889dea72fd4630df482
     and 551667095e22fd8245f03b1ae7d45c0c5a3ec1c3
---

03978ed0dbd7b718171cfe8605b65ea4da20a146