From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 01:02:52 +0000 (+0000)
Subject: merge of 5de14a26c9fe526edc43ef8c1b0610c5ce6b2080
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea449f32f60bb16ac2b21a70e6bd77072df73c1d;p=openembedded.git

merge of 5de14a26c9fe526edc43ef8c1b0610c5ce6b2080
     and 6d86cc1120eb58d3d78c4eeb331067a977f09459
---

ea449f32f60bb16ac2b21a70e6bd77072df73c1d