From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 Aug 2005 12:01:52 +0000 (+0000)
Subject: merge of 0e3cf43c8f55aec7cdc3b6f4ff71869298320085
X-Git-Tag: Release-2010-05/1~9453^2~3967^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0befb98bb295a647fce198f5429850e93839ecb8;p=openembedded.git

merge of 0e3cf43c8f55aec7cdc3b6f4ff71869298320085
     and bc232d57e1fb3fa3c8e9f6e840e1bc9ecf3a7d55
---

0befb98bb295a647fce198f5429850e93839ecb8