From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 22 May 2006 21:42:06 +0000 (+0000)
Subject: merge of 4bea65581a76f2d570ab41485732af8db23f2559
X-Git-Tag: Release-2010-05/1~9453^2~1646
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdd31c44c61561d5ffff2c4f469ffe05a53ef02;p=openembedded.git

merge of 4bea65581a76f2d570ab41485732af8db23f2559
     and 958f273429afa22714e97b2c35ad0a3cd94dc248
---

2bdd31c44c61561d5ffff2c4f469ffe05a53ef02