From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 16 Oct 2006 14:35:49 +0000 (+0000)
Subject: merge of '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~156
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7905194bf3b24e9d1f805e5539549c99b08f3e70;p=openembedded.git

Merge ... '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'
     and '748258dba4c326c803882128fbda7609d96e2709'
---

7905194bf3b24e9d1f805e5539549c99b08f3e70