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

merge of b2dc5386b1cf85eeaa91e944d9c2b5c11752b4f4
     and ef1a7eaa735ef2be21a624ed744a46ec63aedafd
---

fa5444bc011492009ac56e57635d1ea935752187