From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 14:30:55 +0000 (+0000)
Subject: merge of 9ef1e2290857ee6267e1252bc589b9df4f16af3d
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~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5eb2302440f644144ff88bf61857a665280f0e8;p=openembedded.git

merge of 9ef1e2290857ee6267e1252bc589b9df4f16af3d
     and f370cb48efdf23e94cf290e6995a20520736afa8
---

e5eb2302440f644144ff88bf61857a665280f0e8