From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Dec 2006 17:47:09 +0000 (+0000)
Subject: merge of 2c909f3f0c12a8189dc59f032762d7f6e57134f0
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8c8d3e2c15c0bdce025af65f8aaa4312a22b215;p=openembedded.git

merge of 2c909f3f0c12a8189dc59f032762d7f6e57134f0
     and c7ad59a7180211472f8d9a21a61f3994b84b5b47
---

b8c8d3e2c15c0bdce025af65f8aaa4312a22b215