From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 Aug 2005 20:45:15 +0000 (+0000)
Subject: merge of 5b9f262d058d326dc272b37c6613728556effa9c
X-Git-Tag: Release-2010-05/1~9453^2~3901^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99b6de60ddd9dad6171a756023ca0170e4c050ea;p=openembedded.git

merge of 5b9f262d058d326dc272b37c6613728556effa9c
     and f4976c9f1b5d682c92d9f4241affb718217f1074
---

99b6de60ddd9dad6171a756023ca0170e4c050ea