From: Mike Westerhof <mwester@dls.net>
Date: Thu, 30 Mar 2006 15:40:42 +0000 (+0000)
Subject: merge of 7b6a90f4a303bd10227810719197dec0ab049efe
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~36^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b95d798344767600d151f34ee898f668ef704f26;p=openembedded.git

merge of 7b6a90f4a303bd10227810719197dec0ab049efe
     and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484
---

b95d798344767600d151f34ee898f668ef704f26