From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 08:02:01 +0000 (+0000)
Subject: merge of 2af9caaa6a7e9e6105729af007064a7d3e0367b4
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d926f6311250ef922c81f39e6709e111ad82aa8e;p=openembedded.git

merge of 2af9caaa6a7e9e6105729af007064a7d3e0367b4
     and e4bef8b3741983f66d83bf20ec7eb26fc8c3b8a0
---

d926f6311250ef922c81f39e6709e111ad82aa8e