From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 24 Jan 2006 16:43:59 +0000 (+0000)
Subject: merge of 86a447fd0f337e15aaf4a48806a2b49968398915
X-Git-Tag: Release-2010-05/1~9453^2~2565
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3bfe2c3af2d8d6ab64b5d815f2e33b3b455bbaf;p=openembedded.git

merge of 86a447fd0f337e15aaf4a48806a2b49968398915
     and 8fb93f5436990ed75cc95bd943b940ebdc9ae323
---

a3bfe2c3af2d8d6ab64b5d815f2e33b3b455bbaf