From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Jul 2005 10:39:52 +0000 (+0000)
Subject: merge of 4083811b8032d3a372f6aed8c3f16991920880f6
X-Git-Tag: Release-2010-05/1~9453^2~4124^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11037fd3fcf2b4ca2e866048748aa4b0e18a7f26;p=openembedded.git

merge of 4083811b8032d3a372f6aed8c3f16991920880f6
     and d9ca92efbd74f689ba06fe1757077c9e5dd12f0c
---

11037fd3fcf2b4ca2e866048748aa4b0e18a7f26