From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Jul 2005 19:52:44 +0000 (+0000)
Subject: merge of 630804513aa5dc09552fa2067802f3f4dcbd6fe1
X-Git-Tag: Release-2010-05/1~9453^2~4178^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a5728f3328fccdadbb71431d79eb89e9177bee9;p=openembedded.git

merge of 630804513aa5dc09552fa2067802f3f4dcbd6fe1
     and 95c407f44e651c205d21b7df9b1cb6afe48f9508
---

1a5728f3328fccdadbb71431d79eb89e9177bee9