From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 25 Aug 2005 15:05:49 +0000 (+0000)
Subject: merge of 28bb58fd6f81a9c29ff99ea86b0e5dea519615de
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~19
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24ab336bfed235fc4c47b194bd697dd38465d267;p=openembedded.git

merge of 28bb58fd6f81a9c29ff99ea86b0e5dea519615de
     and c7f205e9170643601a9c390d8aeb65d0993e6caa
---

24ab336bfed235fc4c47b194bd697dd38465d267