From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 19 Aug 2005 10:44:55 +0000 (+0000)
Subject: merge of 7a93d384016e8e1ae79f574d3c804e0a38a222e7
X-Git-Tag: Release-2010-05/1~9453^2~3829^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7203552a097c7429519f89ed179f241496cf6394;p=openembedded.git

merge of 7a93d384016e8e1ae79f574d3c804e0a38a222e7
     and 845f932890628e6c650909f15f2585f2b763ace8
---

7203552a097c7429519f89ed179f241496cf6394