From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 15 Aug 2006 17:01:18 +0000 (+0000)
Subject: merge of e261185c5000481d6197a267c92dfb6a14888001
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2^2^2^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f10f198bbff10f3c4cce027f69cdb059f8336f67;p=openembedded.git

merge of e261185c5000481d6197a267c92dfb6a14888001
     and f675128552d989bc13b142dbea3af60149c40241
---

f10f198bbff10f3c4cce027f69cdb059f8336f67