From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 20 Jul 2008 22:09:25 +0000 (+0000)
Subject: merge of '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
X-Git-Tag: Release-2010-05/1~6514
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b50aa832a4f84f3c06db4b3026a23e0059b2ef;p=openembedded.git

Merge ... '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
     and '377e4d7bcf91440bd806ee920d1b7ff72c44b991'
---

70b50aa832a4f84f3c06db4b3026a23e0059b2ef