From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jan 2006 05:58:15 +0000 (+0000)
Subject: merge of 0352b5e5aba6317167740a3467df40a576fd6d54
X-Git-Tag: Release-2010-05/1~9453^2~2721
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad1444ea6d98b66a200a1f2106de844dc346f957;p=openembedded.git

merge of 0352b5e5aba6317167740a3467df40a576fd6d54
     and 128236d8140e77e43ae65c14a618fef3451a7618
---

ad1444ea6d98b66a200a1f2106de844dc346f957