From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 21 Jul 2008 14:08:40 +0000 (+0000)
Subject: merge of '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
X-Git-Tag: Release-2010-05/1~6512
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=889e7461375f2cb6f4429ad2ddd59122c0b0efc0;p=openembedded.git

Merge ... '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
     and 'ef5c7f64094e35acf78793dc2ff1cbcc408d2530'
---

889e7461375f2cb6f4429ad2ddd59122c0b0efc0