From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 14:16:15 +0000 (+0000)
Subject: merge of 33fd418004d32041014bd8fe712eaeb412a503cf
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b61dc560b5f571f14083bca35dd9a2667b176573;p=openembedded.git

merge of 33fd418004d32041014bd8fe712eaeb412a503cf
     and 6401c65a46b33356819b171a03e513d4de5c0225
---

b61dc560b5f571f14083bca35dd9a2667b176573