From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 5 Jul 2005 15:00:57 +0000 (+0000)
Subject: merge of 44956d593fd4538bf972ccf1c800c55fc6155982
X-Git-Tag: Release-2010-05/1~9453^2~4230
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8987a32745bdb779c3e79bda5ef42f7a2f0955;p=openembedded.git

merge of 44956d593fd4538bf972ccf1c800c55fc6155982
     and 6a2d27de7343d2b00b2f4422f97e85a010f1868a
---

6e8987a32745bdb779c3e79bda5ef42f7a2f0955