From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 8 Aug 2005 21:54:34 +0000 (+0000)
Subject: merge of 8682c577fb2d85f5eba728c853258b0de8554651
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~24^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f762edde7f49ce483b181e9df95a30c5dfa4ad53;p=openembedded.git

merge of 8682c577fb2d85f5eba728c853258b0de8554651
     and e35e2ff24f4fd9e88928070713917ac9ebae8029
---

f762edde7f49ce483b181e9df95a30c5dfa4ad53