From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 11 Sep 2005 20:59:08 +0000 (+0000)
Subject: merge of 53eb13501a2259cc700bd74c6a4d5b7022eb3d69
X-Git-Tag: Release-2010-05/1~9453^2~3553
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79f476dc493d2566cd235760f874490478f9be1c;p=openembedded.git

merge of 53eb13501a2259cc700bd74c6a4d5b7022eb3d69
     and 7123616b4991ab3d5b73ef32b51e555cacf38b72
---

79f476dc493d2566cd235760f874490478f9be1c