From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 25 Sep 2005 00:57:58 +0000 (+0000)
Subject: merge of 0999703813e827e2010766c4f16c850b72e85f01
X-Git-Tag: Release-2010-05/1~9453^2~3433^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a6a9203a15e13fcbc60d3f59ad37c59f1d5ba6;p=openembedded.git

merge of 0999703813e827e2010766c4f16c850b72e85f01
     and 6c47e659bdc5f5f73c5abe5b762e5ba029bb05bf
---

a0a6a9203a15e13fcbc60d3f59ad37c59f1d5ba6