From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 15 Mar 2006 15:28:03 +0000 (+0000)
Subject: merge of 4c803688c12b803a4519adfc06f927ddb07199bd
X-Git-Tag: Release-2010-05/1~9453^2~2232^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6dae06aff6875ed818de92fc37876ada7d64fb5;p=openembedded.git

merge of 4c803688c12b803a4519adfc06f927ddb07199bd
     and 914aee760f72a0d88082c029fbaa360b17e7748d
---

d6dae06aff6875ed818de92fc37876ada7d64fb5