From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 30 Jun 2005 19:31:26 +0000 (+0000)
Subject: merge of 0484063486563010f0662099c9c6084d75e9a806
X-Git-Tag: Release-2010-05/1~9453^2~4279
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c70c93b93b743f5fd1127278ae4d49fa4b82036;p=openembedded.git

merge of 0484063486563010f0662099c9c6084d75e9a806
     and 3ecad514c5b23dc2516ed2bb95995f476a1075ac
---

3c70c93b93b743f5fd1127278ae4d49fa4b82036