From: Koen Kooi <koen@openembedded.org>
Date: Thu, 29 Dec 2005 13:02:34 +0000 (+0000)
Subject: merge of ef62b2555a5d30ff42544ba03d38558f139601b4
X-Git-Tag: Release-2010-05/1~9453^2~2833
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f956dbb9d1e9c1c3af424e5e289051ab9009ecf4;p=openembedded.git

merge of ef62b2555a5d30ff42544ba03d38558f139601b4
     and f329d6133a0f6951c95e2f6581c56a63a56a814b
---

f956dbb9d1e9c1c3af424e5e289051ab9009ecf4