From: Koen Kooi <koen@openembedded.org>
Date: Tue, 4 Oct 2005 12:20:58 +0000 (+0000)
Subject: merge of 2283efd4d5567696fe045058b3d139e9871549e9
X-Git-Tag: Release-2010-05/1~9453^2~3370
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6c3ff38d6ebd6058db7b4964efe9758931200fb;p=openembedded.git

merge of 2283efd4d5567696fe045058b3d139e9871549e9
     and a05aaf78acc129c5a440be0cbcd97444c43e57e6
---

a6c3ff38d6ebd6058db7b4964efe9758931200fb