From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 21 Jun 2006 14:05:50 +0000 (+0000)
Subject: merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3136018630882e597a1c19d0fbac2f2fc2207c;p=openembedded.git

merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
     and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06
---

7d3136018630882e597a1c19d0fbac2f2fc2207c