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

merge of 6c26951782d54ed55301a3163326a10e22bd10e9
     and b26ab6bc6ece875def13c510fae8f95b218a94fb
---

b443863746b74b37f20dffa81a0b7c7af91b51d7