From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 16 Jan 2006 22:15:59 +0000 (+0000)
Subject: merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
X-Git-Tag: Release-2010-05/1~9453^2~2634
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47252fc24cbfd80630f5a768bd5ac960b47daace;p=openembedded.git

merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
     and ad95dcf752605087d27c256e46709c87817b0ff0
---

47252fc24cbfd80630f5a768bd5ac960b47daace