From: kolla <kolla@uninett.no>
Date: Tue, 2 Aug 2005 00:02:04 +0000 (+0000)
Subject: merge of 08db957fdc2ccf76cc3653ef7749381a03947741
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~4^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333f109e030f35abc06a059c567facee8703c537;p=openembedded.git

merge of 08db957fdc2ccf76cc3653ef7749381a03947741
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999
---

333f109e030f35abc06a059c567facee8703c537