From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 21 Mar 2006 00:16:38 +0000 (+0000)
Subject: merge of 2fd623e8d76c78b3918a5881b42ffab1609a05d0
X-Git-Tag: Release-2010-05/1~9453^2~2183^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d265c0aba835e1833d631154718ddcefe60faee;p=openembedded.git

merge of 2fd623e8d76c78b3918a5881b42ffab1609a05d0
     and d6ae2145fa0116f5eb9376594a80f8bf63c64b86
---

4d265c0aba835e1833d631154718ddcefe60faee