From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Sep 2005 10:23:32 +0000 (+0000)
Subject: merge of 609271c40b312ab6442f49fa8fcf91b9de016933
X-Git-Tag: Release-2010-05/1~9453^2~3547
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48562ec91aa2f738f64e0e7ab0f006101c22655e;p=openembedded.git

merge of 609271c40b312ab6442f49fa8fcf91b9de016933
     and ad9133020a1a5b111af22c9ecb30c8ce1e428169
---

48562ec91aa2f738f64e0e7ab0f006101c22655e