From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 13 Jan 2006 21:44:54 +0000 (+0000)
Subject: merge of 40056da70781bf36b181b88a8599031c80c2b1cc
X-Git-Tag: Release-2010-05/1~9453^2~2665
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dc43aae3865d972ad7873ab841a77a0d96472b1;p=openembedded.git

merge of 40056da70781bf36b181b88a8599031c80c2b1cc
     and fcac3802b9b29fd5043205c7b97bb4201ec6352b
---

1dc43aae3865d972ad7873ab841a77a0d96472b1