From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 14:31:33 +0000 (+0000)
Subject: merge of ae0b3daa8ead3db955704bad8f48cf498622961d
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed508b79ebe8933af15a7fd84f7db0837d5ad9f;p=openembedded.git

merge of ae0b3daa8ead3db955704bad8f48cf498622961d
     and ce3b6559d2cb3ba65a6dd0f69e76c890fe48f129
---

9ed508b79ebe8933af15a7fd84f7db0837d5ad9f