From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Jul 2006 12:33:25 +0000 (+0000)
Subject: merge of 74324a04301a770e8af5057b86f0d17b225b6d0f
X-Git-Tag: Release-2010-05/1~9453^2~1253
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4040941c8122f1bba5750b71d1728f003fce626b;p=openembedded.git

merge of 74324a04301a770e8af5057b86f0d17b225b6d0f
     and fa3fb685758862d7a61d1fa76cd38523291a05fe
---

4040941c8122f1bba5750b71d1728f003fce626b