From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Apr 2006 21:31:06 +0000 (+0000)
Subject: merge of 3f0a9654c9edcee221d5d5fbb4421a37e22afb38
X-Git-Tag: Release-2010-05/1~9453^2~1865^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbbfd9a62ca834df8d48aa45763ab1237b61405e;p=openembedded.git

merge of 3f0a9654c9edcee221d5d5fbb4421a37e22afb38
     and 888bba9e9eb91ecf014ac024cdb877b7aa217b38
---

cbbfd9a62ca834df8d48aa45763ab1237b61405e