From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 7 Aug 2005 12:36:48 +0000 (+0000)
Subject: merge of 95ff9f961bf59ce2a886e3909caec19578cdb748
X-Git-Tag: Release-2010-05/1~9453^2~3957
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e601a38b4c90796dbd924ca19aa0323cedb38349;p=openembedded.git

merge of 95ff9f961bf59ce2a886e3909caec19578cdb748
     and d7ed0afa1330981687d744a07b9d8b03ef46a6bf
---

e601a38b4c90796dbd924ca19aa0323cedb38349