From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 18 Jan 2006 15:38:00 +0000 (+0000)
Subject: merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
X-Git-Tag: Release-2010-05/1~9453^2~2629
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e475db3258cccd9f7b098be7c82813766bfc63f7;p=openembedded.git

merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
     and 7eab4425d3ef00f6bc0fc9dcf55117c3cf8c24d6
---

e475db3258cccd9f7b098be7c82813766bfc63f7