From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 25 Sep 2005 12:50:59 +0000 (+0000)
Subject: merge of 67751448562cee294c455a1ca90add74cc339b78
X-Git-Tag: Release-2010-05/1~9453^2~3433
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25b1b3efea1ed12c1953978b7a083f666dc4e68;p=openembedded.git

merge of 67751448562cee294c455a1ca90add74cc339b78
     and ccbb80bf271c9a4cfead703ac33b9b69e95d755e
---

c25b1b3efea1ed12c1953978b7a083f666dc4e68