From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Apr 2006 22:15:00 +0000 (+0000)
Subject: merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
X-Git-Tag: Release-2010-05/1~9453^2~2095^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64736d9a4d3ff35eeefb84fbb6bdb2999f84197c;p=openembedded.git

merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
     and 1a727f78bc6a4e9e47da2fa7480e59efc5555960
---

64736d9a4d3ff35eeefb84fbb6bdb2999f84197c