From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 Aug 2006 14:16:23 +0000 (+0000)
Subject: merge of 4569ccd3ba47dcb3b8065262d72969eb75349a14
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f0b74c3f480759c5924bf616d10685eebfe585;p=openembedded.git

merge of 4569ccd3ba47dcb3b8065262d72969eb75349a14
     and 9062ecf12276bf22e45407251118d15448a7679c
---

26f0b74c3f480759c5924bf616d10685eebfe585