From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 3 Jul 2005 17:14:55 +0000 (+0000)
Subject: merge of 0e4f20b5f73c66a8b0ff442658306eb24666a628
X-Git-Tag: Release-2010-05/1~9453^2~4243^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf68f5a1ec89042fbed9e8a8990f1dd93047757;p=openembedded.git

merge of 0e4f20b5f73c66a8b0ff442658306eb24666a628
     and aa37801871f021c37b88d43fee5f45ca91367b15
---

dbf68f5a1ec89042fbed9e8a8990f1dd93047757