From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 3 Oct 2008 09:04:25 +0000 (+0000)
Subject: merge of '23370e87858b05ea1295304df746770cdb584233'
X-Git-Tag: Release-2010-05/1~5850^2~22^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c61f309621cb99f138a9d41e5aeb9a5395e7fed;p=openembedded.git

Merge ... '23370e87858b05ea1295304df746770cdb584233'
     and '2c4fce4a2279b81964f4d6df1eb7ec66a8bd6796'
---

1c61f309621cb99f138a9d41e5aeb9a5395e7fed