From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 Aug 2006 18:16:40 +0000 (+0000)
Subject: merge of 6b6561dd74bdfe32b4ff1ce88d53f233096e3a3f
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^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2~2^2~1^2~2^2^2^2~1^2^2~3^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd9614e140e4bb3410aafe5b4d9be25af4cee54;p=openembedded.git

merge of 6b6561dd74bdfe32b4ff1ce88d53f233096e3a3f
     and f68e3cc92daed9f7a91b2debef768da7698730e4
---

cfd9614e140e4bb3410aafe5b4d9be25af4cee54