From: Patrick Ohly <patrick.ohly@gmx.de>
Date: Wed, 24 Aug 2005 20:54:03 +0000 (+0000)
Subject: merge of 889c17fb00a7db9ccb772e522e5d84a4cc218ff8
X-Git-Tag: Release-2010-05/1~9453^2~3818
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930e9671d7e44d8263f490e96dc619eccd56a133;p=openembedded.git

merge of 889c17fb00a7db9ccb772e522e5d84a4cc218ff8
     and b4bff47a815e0e0e2e911dc25e7390b6de29e41e
---

930e9671d7e44d8263f490e96dc619eccd56a133