From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 8 Jul 2008 09:19:37 +0000 (+0000)
Subject: merge of '26f1976aebe86c41d96f819481534c07971f4cfe'
X-Git-Tag: Release-2010-05/1~6546^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28c9719d37d58902f1a18b409367af8a49dff81f;p=openembedded.git

Merge ... '26f1976aebe86c41d96f819481534c07971f4cfe'
     and '46607c54b809e03372f1d5b8cdebbf77f4ffcd02'
---

28c9719d37d58902f1a18b409367af8a49dff81f