From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 12:05:06 +0000 (+0000)
Subject: merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
X-Git-Tag: Release-2010-05/1~9453^2~2895
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d12338905b7ac84bab70ecf0f4e3d7f704c7fe99;p=openembedded.git

merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
     and 5c447cd90d49ff7228679b71f67a78e1a48e10d7
---

d12338905b7ac84bab70ecf0f4e3d7f704c7fe99