From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 10 Aug 2006 12:21:05 +0000 (+0000)
Subject: merge of 963bef78cb5cce1bc02dc3d20926c05ed5a0829e
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~3^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063f56410a587a670dd98ee432f7d76b42d0a765;p=openembedded.git

merge of 963bef78cb5cce1bc02dc3d20926c05ed5a0829e
     and d0d679b8dd75fda2d9302444ab3ff913e495d02f
---

063f56410a587a670dd98ee432f7d76b42d0a765