From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 Aug 2006 03:31:22 +0000 (+0000)
Subject: merge of 14917049ca38865d541726340df4e735749d9fc9
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc43516b8191df4813f7135b1a5b7dd92eb9a513;p=openembedded.git

merge of 14917049ca38865d541726340df4e735749d9fc9
     and 95729e64583891417cff50474eb3bcd7b5b399a7
---

bc43516b8191df4813f7135b1a5b7dd92eb9a513