From: Koen Kooi <koen@openembedded.org>
Date: Wed, 5 Oct 2005 17:51:41 +0000 (+0000)
Subject: merge of aa89decda49eb9f74b334f404fd14af6fde11da8
X-Git-Tag: Release-2010-05/1~9453^2~3359
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07cf0d98b30ce6887993db22608d84d1ad66f522;p=openembedded.git

merge of aa89decda49eb9f74b334f404fd14af6fde11da8
     and da7858591237b184c0a172490f369d80a9b47ef8
---

07cf0d98b30ce6887993db22608d84d1ad66f522