From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 26 Sep 2005 22:57:12 +0000 (+0000)
Subject: merge of 3aa50a835b9cb17bb8bfd3632f5b0ed705e72497
X-Git-Tag: Release-2010-05/1~9453^2~3410
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83efa27db510e78468b22e11eef08dc227a10842;p=openembedded.git

merge of 3aa50a835b9cb17bb8bfd3632f5b0ed705e72497
     and 5d8bca6d9c7f630730b3e833e5a667b6987ccd1d
---

83efa27db510e78468b22e11eef08dc227a10842