From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 24 Jul 2005 21:27:10 +0000 (+0000)
Subject: merge of 6e10609c36e07bf2bc3dc1f6840ff0cbb1fab3b5
X-Git-Tag: Release-2010-05/1~9453^2~4062^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993f099fd774f49ff3cebeeb4503847d38251073;p=openembedded.git

merge of 6e10609c36e07bf2bc3dc1f6840ff0cbb1fab3b5
     and cacdd0f9881c1cd93f95e5d3bef2a2db8dea2d3b
---

993f099fd774f49ff3cebeeb4503847d38251073