From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Jul 2005 11:27:52 +0000 (+0000)
Subject: merge of 62e43adfa95f28be56e88ed4588c52ea8b613b76
X-Git-Tag: Release-2010-05/1~9453^2~4252^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfb5aafc390f2661bbddda19abce1ac512cd31b5;p=openembedded.git

merge of 62e43adfa95f28be56e88ed4588c52ea8b613b76
     and 99b336970fe25f98faf47c5cb651ec42bf0897b3
---

cfb5aafc390f2661bbddda19abce1ac512cd31b5