From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 8 May 2006 14:12:16 +0000 (+0000)
Subject: merge of 300f5db9f8e0ccf916ea03ecd5fc5ac7918cafc2
X-Git-Tag: Release-2010-05/1~9453^2~1751
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d602b41d43ea2fed892cf19b3cb336de1a3ab99;p=openembedded.git

merge of 300f5db9f8e0ccf916ea03ecd5fc5ac7918cafc2
     and 735fb263a309dee38c3b649227cd8c50308fca68
---

8d602b41d43ea2fed892cf19b3cb336de1a3ab99