From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 4 Jul 2006 11:23:17 +0000 (+0000)
Subject: merge of 2e5f74aaab40ef75a6f2fc3a1957ec9e64efe919
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5e967b3c4b8fca10803c391d0e15c71cfc9aa4b;p=openembedded.git

merge of 2e5f74aaab40ef75a6f2fc3a1957ec9e64efe919
     and dd117e97833aeb9cbc87f3bda3749aae2426d332
---

c5e967b3c4b8fca10803c391d0e15c71cfc9aa4b