From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 4 Jul 2005 13:25:56 +0000 (+0000)
Subject: merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4
X-Git-Tag: Release-2010-05/1~9453^2~4237^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b54d4c82eceb6f2145a651a1ba945c6345c3e0;p=openembedded.git

merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4
     and 4f22ecbf9b052611a52b5e12802a2d8a9584cea7
---

72b54d4c82eceb6f2145a651a1ba945c6345c3e0