From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 5 Sep 2005 18:05:02 +0000 (+0000)
Subject: merge of 8ff944953434311b09f162dfad1932c2c1222d7e
X-Git-Tag: Release-2010-05/1~9453^2~3639
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23379302435b880760cb8a65fe01b9c319276ec9;p=openembedded.git

merge of 8ff944953434311b09f162dfad1932c2c1222d7e
     and b3d467de4bd859eaa9c1dc56ad7792a6ae15cca1
---

23379302435b880760cb8a65fe01b9c319276ec9