From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 11:22:00 +0000 (+0000)
Subject: merge of 93f6aca0335dace467591d3dbba7c7852abfd438
X-Git-Tag: Release-2010-05/1~9453^2~1690
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8985190874cae3947bd246e70ab469ba49ddd9e4;p=openembedded.git

merge of 93f6aca0335dace467591d3dbba7c7852abfd438
     and 95448ac3b9d96ecd3141adff3929eb344db65a93
---

8985190874cae3947bd246e70ab469ba49ddd9e4