From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 11:16:20 +0000 (+0000)
Subject: merge of 985cd9592c6d9e0954da67619b51350d779b9715
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~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a834bc66d564eee51d0e6b06ef71b12f038c6508;p=openembedded.git

merge of 985cd9592c6d9e0954da67619b51350d779b9715
     and d1b15f2093236fb8de52da23e480b891b397e184
---

a834bc66d564eee51d0e6b06ef71b12f038c6508