From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 14:16:54 +0000 (+0000)
Subject: merge of 65b511b81bcf7e1ae96e859bfc24c8a5bddfb9bb
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be214976ec070e536aa4414d6c8a528c9c1209c7;p=openembedded.git

merge of 65b511b81bcf7e1ae96e859bfc24c8a5bddfb9bb
     and 7847a5c5647044d4667a481264311632301f3907
---

be214976ec070e536aa4414d6c8a528c9c1209c7