From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 3 Aug 2005 17:47:30 +0000 (+0000)
Subject: merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~14^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec96395fc7cac1c8a799f916406831080a3ab767;p=openembedded.git

merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
     and 83403a57c1ba58c63ed272bbb6ca23babd62ba37
---

ec96395fc7cac1c8a799f916406831080a3ab767