From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 Aug 2006 16:46:34 +0000 (+0000)
Subject: merge of 842867b86f48a8f46c04c857d103bd60d98d1062
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^2~3^2~3^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c71cd805121035e72117d54558a3777782fe9395;p=openembedded.git

merge of 842867b86f48a8f46c04c857d103bd60d98d1062
     and 9d224d3045ff80efaf3a2c11a9b1439564dfb3d0
---

c71cd805121035e72117d54558a3777782fe9395