From: Koen Kooi <koen@openembedded.org>
Date: Thu, 25 Aug 2005 13:50:04 +0000 (+0000)
Subject: merge of aefd8b85d8866ff05ae03c31658567c0a0d18d11
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~20^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a607f3db5c529343e70e3f5bc9c39c693c637007;p=openembedded.git

merge of aefd8b85d8866ff05ae03c31658567c0a0d18d11
     and e4f6787633b4d486e7052126b91dadaf9a933dff
---

a607f3db5c529343e70e3f5bc9c39c693c637007