From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 18 Sep 2005 14:55:26 +0000 (+0000)
Subject: merge of d4dacf3f494f19480484b5e0d7806960a0ba7909
X-Git-Tag: Release-2010-05/1~9453^2~3496^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580812d45b4d728b2269ed2e94703b168342ea09;p=openembedded.git

merge of d4dacf3f494f19480484b5e0d7806960a0ba7909
     and e957dec81b0871cd7d43333a923a3249859c91f7
---

580812d45b4d728b2269ed2e94703b168342ea09