From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 6 Jul 2007 22:04:41 +0000 (+0000)
Subject: merge of '6bf4895c5f2152a0cafda3d402b7b1190cd8469a'
X-Git-Tag: Release-2010-05/1~8868^2~192
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d26a6472e6564031c78d8a9bae2c1effb1cd67a;p=openembedded.git

Merge ... '6bf4895c5f2152a0cafda3d402b7b1190cd8469a'
     and 'd5b50f42c0a46a86e2e6458ba37bf575cad2f411'
---

4d26a6472e6564031c78d8a9bae2c1effb1cd67a