From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 7 Aug 2006 20:44:53 +0000 (+0000)
Subject: merge of 7d7323376ea7f6cae9fe0cdfb367a78cab4dd545
X-Git-Tag: Release-2010-05/1~9453^2~999^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31b17ffa0db8012bc2a86c398acf119d10459f5f;p=openembedded.git

merge of 7d7323376ea7f6cae9fe0cdfb367a78cab4dd545
     and b54bb5e5747d757772498c2e3c720f407fdcf023
---

31b17ffa0db8012bc2a86c398acf119d10459f5f