From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Feb 2006 03:17:07 +0000 (+0000)
Subject: merge of 4ea020353f2312e619cfed7b9c2ae9d32b71012d
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d409e4eb2652bfc46272ffc5b6281731dd367e;p=openembedded.git

merge of 4ea020353f2312e619cfed7b9c2ae9d32b71012d
     and ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
---

e0d409e4eb2652bfc46272ffc5b6281731dd367e