From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 Aug 2005 11:34:32 +0000 (+0000)
Subject: merge of a85c8bb53604e3bd7a5ae3d8b5eb3f084798e061
X-Git-Tag: Release-2010-05/1~9453^2~3967^2~1^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=649c30e929cc83ffabf85db4577fe5b3df263788;p=openembedded.git

merge of a85c8bb53604e3bd7a5ae3d8b5eb3f084798e061
     and fb1746edef94a5e7e29a7b45e8455f288181530c
---

649c30e929cc83ffabf85db4577fe5b3df263788