From: Mike Westerhof <mwester@dls.net>
Date: Sat, 25 Mar 2006 21:41:06 +0000 (+0000)
Subject: merge of 1f027d0a7ff2fc1d9e55a283b79111f7c0438568
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~36^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bef8adcd76891ad360f7fedaf3f4c433cf6c409f;p=openembedded.git

merge of 1f027d0a7ff2fc1d9e55a283b79111f7c0438568
     and e4c846c44328910ba55f411d54a32e47cbc2185b
---

bef8adcd76891ad360f7fedaf3f4c433cf6c409f