From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 21:46:30 +0000 (+0000)
Subject: merge of 8605731b4522785b2e02d610d5eb7f491cffad2d
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=414cf9714f32c664d48f4eca8f76b136962cba3f;p=openembedded.git

merge of 8605731b4522785b2e02d610d5eb7f491cffad2d
     and fc1732cf7e4fb24bf765ee81ceaee15b42ff57d6
---

414cf9714f32c664d48f4eca8f76b136962cba3f