From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 14:48:59 +0000 (+0000)
Subject: merge of 556701784db3bdee81ffbb2c896a747e4e4e19b0
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~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54100ad7606e5d782e441ee596bd85529e9728e9;p=openembedded.git

merge of 556701784db3bdee81ffbb2c896a747e4e4e19b0
     and 8b3f99cac7b433e63ebc902c06ae99fbf39205c7
---

54100ad7606e5d782e441ee596bd85529e9728e9