From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 19:17:06 +0000 (+0000)
Subject: merge of 613b5c88485972422f9f5ca5450f8d356f4a22cd
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0d867390440e73397d8c0d244a623ad8580bc2c;p=openembedded.git

merge of 613b5c88485972422f9f5ca5450f8d356f4a22cd
     and 6b5174a92b34a002e2e75bb09cc02e1d8770811f
---

b0d867390440e73397d8c0d244a623ad8580bc2c