From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 22 Jun 2007 13:05:18 +0000 (+0000)
Subject: merge of '148f8dde1ce484726500604f6b511b828737ed47'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~28^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7f445a9c6463ce4a7cec1844911085b1536b1c;p=openembedded.git

Merge ... '148f8dde1ce484726500604f6b511b828737ed47'
     and '6ac0eb72e728e774076082cbfbb28ee430dc6485'
---

2f7f445a9c6463ce4a7cec1844911085b1536b1c