From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Jul 2006 14:40:31 +0000 (+0000)
Subject: merge of 78c141426ac25a36e8345e703ee6eb3f523b2e69
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3589f03e38c55960d7e4ffc0e1928a38e8b02f4;p=openembedded.git

merge of 78c141426ac25a36e8345e703ee6eb3f523b2e69
     and 7bdc9a56f17551347d3b0b1a957cdb1e1429e3ba
---

d3589f03e38c55960d7e4ffc0e1928a38e8b02f4