From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Dec 2005 18:21:27 +0000 (+0000)
Subject: merge of 339acd78a0048095d63604cf15366e8bc0e87d60
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=386066aa42d543e3916be0bebcf5ff38efda5400;p=openembedded.git

merge of 339acd78a0048095d63604cf15366e8bc0e87d60
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d
---

386066aa42d543e3916be0bebcf5ff38efda5400