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

merge of 9493767780c108c1eb032fd49a0a9898244577b9
     and c82bfc5b903cf0dade276c5bd6e1312736edeece
---

40d70c5fc78f511b4c6f71b78ba9fce8d3ad09aa