From: Mike Westerhof <mwester@dls.net>
Date: Wed, 1 Mar 2006 02:26:05 +0000 (+0000)
Subject: merge of 6f4af617fd386f3750a685b9fab522d9c868c729
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01df2692914cb17e127282ed164243b99d26aa62;p=openembedded.git

merge of 6f4af617fd386f3750a685b9fab522d9c868c729
     and 83f19fb9d221b3326d823d0c4833b0df84cec412
---

01df2692914cb17e127282ed164243b99d26aa62