From: Koen Kooi <koen@openembedded.org>
Date: Fri, 9 Dec 2005 10:40:03 +0000 (+0000)
Subject: merge of 3d36999259540aad0864e3018cb37560232cbb86
X-Git-Tag: Release-2010-05/1~9453^2~2960
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8e3bcf57fe894ffe203127fcaa95e5b50f10dc1;p=openembedded.git

merge of 3d36999259540aad0864e3018cb37560232cbb86
     and d4be44886b4f04bdee851d4031e18277d8439775
---

e8e3bcf57fe894ffe203127fcaa95e5b50f10dc1