From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Feb 2006 17:28:37 +0000 (+0000)
Subject: merge of 006bbeb2da2090839ec05cdbd7cd825c900ac850
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83105ad9e6045639a7c4a4a95f78dd8685588baf;p=openembedded.git

merge of 006bbeb2da2090839ec05cdbd7cd825c900ac850
     and f144cf893311c20cf43f68a99c982431aa75861f
---

83105ad9e6045639a7c4a4a95f78dd8685588baf