From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 11:46:15 +0000 (+0000)
Subject: merge of 1849d4f33fde22e81c3b722948256025bb9b6661
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=272979f357c25888c3fe6cf0ab9e99eace9aff68;p=openembedded.git

merge of 1849d4f33fde22e81c3b722948256025bb9b6661
     and 25188d2bd40e6512ab25d6ce4eb08aa44ccc4d49
---

272979f357c25888c3fe6cf0ab9e99eace9aff68