From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 11 Jul 2007 11:14:05 +0000 (+0000)
Subject: merge of '06dece86b19a87ce894b51a9a4596d0dd10aa368'
X-Git-Tag: Release-2010-05/1~8868^2~174^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=926bfde12c8d306e07ae1ca293b6b0fb38bf6852;p=openembedded.git

Merge ... '06dece86b19a87ce894b51a9a4596d0dd10aa368'
     and 'f6d341299c43235d3c37dbbb33a02a56ea8370c3'
---

926bfde12c8d306e07ae1ca293b6b0fb38bf6852