From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 21 Aug 2006 00:25:26 +0000 (+0000)
Subject: merge of 02201a31a371cb4632ab2389a885f4c37494a1eb
X-Git-Tag: Release-2010-05/1~9453^2~911^2~29^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75d4a8e52a3d982b95bd082337fdd23ba55fcac;p=openembedded.git

merge of 02201a31a371cb4632ab2389a885f4c37494a1eb
     and 27ccadac8de1a506e26898f5e97c53a9b9bcb534
---

b75d4a8e52a3d982b95bd082337fdd23ba55fcac