From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 18 Jan 2006 10:59:59 +0000 (+0000)
Subject: merge of 6140847fcfac52c881f2bf65906299e435571b8f
X-Git-Tag: Release-2010-05/1~9453^2~2627^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d3c02597e3e07fa1150ed6117f1134fc93784bf;p=openembedded.git

merge of 6140847fcfac52c881f2bf65906299e435571b8f
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623
---

3d3c02597e3e07fa1150ed6117f1134fc93784bf