From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 Jul 2006 10:32:02 +0000 (+0000)
Subject: merge of 8f81c821d4522c9367e23584313e4bbf36557144
X-Git-Tag: Release-2010-05/1~9453^2~1315^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2953a91f058967ca45ec92084b12a6b80b54ea01;p=openembedded.git

merge of 8f81c821d4522c9367e23584313e4bbf36557144
     and aa68ff4c40aba03b1dd84c1e7efb9788ba509f51
---

2953a91f058967ca45ec92084b12a6b80b54ea01