From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 20:55:15 +0000 (+0000)
Subject: merge of 2a35ebf8aac4cd73e0ac9369feb9250cedab4b65
X-Git-Tag: Release-2010-05/1~9453^2~567^2~162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eebefa5660ca2fc72c89bee0758c415618e344f8;p=openembedded.git

merge of 2a35ebf8aac4cd73e0ac9369feb9250cedab4b65
     and c5ad8766630613eed09e775210fd8e2ce86c5a1d
---

eebefa5660ca2fc72c89bee0758c415618e344f8