From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 Aug 2006 20:47:01 +0000 (+0000)
Subject: merge of 2bf0c3bc82f1c3fd73dd5794a80a4dfbf25d9ac3
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~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac65770fbb27568a81d1bfc161208235cb3b287;p=openembedded.git

merge of 2bf0c3bc82f1c3fd73dd5794a80a4dfbf25d9ac3
     and c6503f659bf477fbd684cf50b9a73db2e7af3bbc
---

fac65770fbb27568a81d1bfc161208235cb3b287