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

merge of 671436287e2972141d0abfc38c0fa25aa9d24af6
     and b0f19e032dfccb39dc71a25c1ac7044dca095197
---

1f91781a09ddeb7698cb3774eb5b308198e9decb