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

merge of baf16ab89a58be4c5de2ade0680a662a6783bb5f
     and bf5934d4d03576ba9e74f579156f8369ae99c483
---

b939e3b25a77e488dff0ab57e36408394526b9cc