From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 13:46:43 +0000 (+0000)
Subject: merge of 080644e9588853545b0a7f1ff6839082ba558f88
X-Git-Tag: Release-2010-05/1~9453^2~2887
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78140dd07eef46414dc8b42b16fbfc36849a0b55;p=openembedded.git

merge of 080644e9588853545b0a7f1ff6839082ba558f88
     and e302bc56b46ca74429ac0c514ee30ee9429d78ea
---

78140dd07eef46414dc8b42b16fbfc36849a0b55