From: Koen Kooi <koen@openembedded.org>
Date: Wed, 7 Sep 2005 10:16:00 +0000 (+0000)
Subject: merge of 0f2f529b92dbcf9e16ad45331308b7b059bfbfc7
X-Git-Tag: Release-2010-05/1~9453^2~3623
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b57f55b0c0c3c619f7d5850a2de4a91c5dbc4958;p=openembedded.git

merge of 0f2f529b92dbcf9e16ad45331308b7b059bfbfc7
     and 81fb073242cc3af84d2044617f4f235d8c219c04
---

b57f55b0c0c3c619f7d5850a2de4a91c5dbc4958