From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 21 Jul 2005 16:42:58 +0000 (+0000)
Subject: merge of 1128356cf74edd3dc9e128ad1f830a989faf8e2f
X-Git-Tag: Release-2010-05/1~9453^2~4096^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40c5b40e67325fd054d160367f0d52c4bfc91b9;p=openembedded.git

merge of 1128356cf74edd3dc9e128ad1f830a989faf8e2f
     and a8d45d0b05a8392ab241eca4deab7c8bc83b0a2d
---

e40c5b40e67325fd054d160367f0d52c4bfc91b9