From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Feb 2006 09:58:37 +0000 (+0000)
Subject: merge of 6f3628b0dba700cfacce31a608706bb638c5c134
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a4afa4e347b3849b08a8fbac8883ab558025a24;p=openembedded.git

merge of 6f3628b0dba700cfacce31a608706bb638c5c134
     and e7ddf084f75a5ee0d7e8ea106ce96c37362b4e64
---

9a4afa4e347b3849b08a8fbac8883ab558025a24