From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Jul 2006 17:09:45 +0000 (+0000)
Subject: merge of 2669117ead966ed1a52946f4b039a239cfd06607
X-Git-Tag: Release-2010-05/1~9453^2~1313
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed1ff98939b98eef01d4c6c226d8cfbce1d3928a;p=openembedded.git

merge of 2669117ead966ed1a52946f4b039a239cfd06607
     and 4fe87eebac509c58687cf710c3f2394ab2805dbd
---

ed1ff98939b98eef01d4c6c226d8cfbce1d3928a