From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 31 Jul 2005 17:57:49 +0000 (+0000)
Subject: merge of 2c9a9f52d7a84d26b72104dfc968f2430ae26091
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~36^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5f531835e67995fabd0dec7f77b44afb6f4168;p=openembedded.git

merge of 2c9a9f52d7a84d26b72104dfc968f2430ae26091
     and bda34a3079d192cc0342b04ecd99d52fdbe2f633
---

2c5f531835e67995fabd0dec7f77b44afb6f4168