From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 1 Aug 2005 20:05:07 +0000 (+0000)
Subject: merge of 5ae8db073bc2bb13b71406d13b300a0da7091653
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3819a64dd1b4cf7edbadbf532905db489a771276;p=openembedded.git

merge of 5ae8db073bc2bb13b71406d13b300a0da7091653
     and 5fe78440967952c99c9ba1267d694ee7983611cc
---

3819a64dd1b4cf7edbadbf532905db489a771276