From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 16 Feb 2006 23:06:02 +0000 (+0000)
Subject: merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
X-Git-Tag: Release-2010-05/1~9453^2~2338
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6f6ecb62b493d186fcfd302f1b60c886c68e55b;p=openembedded.git

merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
     and 96f792c135e95ff503266e442db17ede3ba27060
---

e6f6ecb62b493d186fcfd302f1b60c886c68e55b