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

merge of 4c416c31ac1dee91ca836f2dee1069b2b0a55035
     and 6f5961443b32f9a8e798dd9a5f5042bda9f0351d
---

d2c2d7bd0e2d51e7e9d44da0d04185838d921e4f